diff --git a/src/eventlog.js b/src/eventlog.js index 40aca5714..0a9a397e5 100644 --- a/src/eventlog.js +++ b/src/eventlog.js @@ -121,14 +121,7 @@ function cleanup(callback) { var d = new Date(); d.setDate(d.getDate() - 10); // 10 days ago - // only cleanup high frequency events - var actions = [ - exports.ACTION_USER_LOGIN, - exports.ACTION_BACKUP_START, - exports.ACTION_BACKUP_FINISH - ]; - - eventlogdb.delByCreationTime(d, actions, function (error) { + eventlogdb.delByCreationTime(d, function (error) { if (error) return callback(new EventLogError(EventLogError.INTERNAL_ERROR, error)); callback(null); diff --git a/src/eventlogdb.js b/src/eventlogdb.js index 4cbffe198..8a025c8dd 100644 --- a/src/eventlogdb.js +++ b/src/eventlogdb.js @@ -121,15 +121,13 @@ function clear(callback) { }); } -function delByCreationTime(creationTime, actions, callback) { +function delByCreationTime(creationTime, callback) { assert(util.isDate(creationTime)); - assert(Array.isArray(actions)); assert.strictEqual(typeof callback, 'function'); - var query = 'DELETE FROM eventlog WHERE creationTime < ? '; - if (actions.length) query += ' AND ( ' + actions.map(function () { return 'action != ?'; }).join(' AND ') + ' ) '; + var query = 'DELETE FROM eventlog WHERE creationTime < ?'; - database.query(query, [ creationTime ].concat(actions), function (error) { + database.query(query, [ creationTime ], function (error) { if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error)); callback(error); diff --git a/src/test/database-test.js b/src/test/database-test.js index bbcc3b324..0635fa29a 100644 --- a/src/test/database-test.js +++ b/src/test/database-test.js @@ -1412,17 +1412,12 @@ describe('database', function () { }, function (error) { expect(error).to.be(null); - var actions = [ 'anotherpersistent.event', 'persistent.event' ]; - - eventlogdb.delByCreationTime(new Date(), actions, function (error) { + eventlogdb.delByCreationTime(new Date(), function (error) { expect(error).to.be(null); eventlogdb.getAllPaged([], null, 1, 100, function (error, results) { expect(error).to.be(null); - expect(results.length).to.be(2); - results = results.sort(function (x, y) { return x.action > y.action; }); // because equal timestamp gives random ordering - expect(results[1].action).to.be.eql('persistent.event'); - expect(results[0].action).to.be.eql('anotherpersistent.event'); + expect(results.length).to.be(0); done(); });