This commit is contained in:
Andris Reinman 2016-06-22 15:25:36 +03:00
parent b16209f23e
commit 4e33cc471f
6 changed files with 35 additions and 23 deletions

View file

@ -95,7 +95,7 @@ module.exports.getQuery = (id, callback) => {
}
let limit = 300;
let treshold = 3600 * 24; // time..NOW..time+24h
let treshold = 3600 * 6; // time..NOW..time+6h, 6 hour window after trigger target to detect it
let intervalQuery = (column, seconds, treshold) => column + ' <= NOW() - INTERVAL ' + seconds + ' SECOND AND ' + column + ' >= NOW() - INTERVAL ' + (treshold + seconds) + ' SECOND';
@ -320,8 +320,8 @@ module.exports.delete = (id, callback) => {
}
connection.query('DELETE FROM triggers WHERE id=? LIMIT 1', [id], (err, result) => {
connection.release();
if (err) {
connection.release();
return callback(err);
}
@ -337,11 +337,11 @@ module.exports.delete = (id, callback) => {
};
function createTriggerTable(id, callback) {
let query = 'CREATE TABLE `trigger__' + id + '` LIKE `trigger`';
db.getConnection((err, connection) => {
if (err) {
return callback(err);
}
let query = 'CREATE TABLE `trigger__' + id + '` LIKE `trigger`';
connection.query(query, err => {
connection.release();
if (err) {
@ -353,11 +353,11 @@ function createTriggerTable(id, callback) {
}
function removeTriggerTable(id, callback) {
let query = 'DROP TABLE IF EXISTS `trigger__' + id + '`';
db.getConnection((err, connection) => {
if (err) {
return callback(err);
}
let query = 'DROP TABLE IF EXISTS `trigger__' + id + '`';
connection.query(query, err => {
connection.release();
if (err) {