verify action IDs

lib/agent/actions.js

@@ -138,14 +138,12 @@ actions.stop = function(id) {
 
 // revisar q esto siga funcionando!
 actions.stop_all = function() {
-  console.log("STOP ALL!!!")
   for (var name in running)
     this.stop(name);
 }
 
 // esta tb
 actions.running = function() {
-  console.log("RUNNING")
   var list = [];
   for (var key in running) {
     if (running[key].type == 'action') {

lib/agent/actions/fileretrieval/index.js

@@ -84,7 +84,6 @@ exports.start = function(id, options, cb) {
   // in order to resume the upload from that position.
   needle.request('get', url, null, function(err, res) {
     if (err) {
-      console.log(err);
       return;
     }
     if (res.statusCode == 404) {

lib/agent/actions/fileretrieval/storage.js

@@ -36,7 +36,6 @@ exports.set_file = function(type, id, opts, cb) {
 exports.update_file = function(type, id, key, opts, cb) {
   logger.debug('Storing command in DB: ' + key);
   storage.do('update', { type: type, id: id, columns: opts.columns, values: opts.values }, (err) => {
-    console.log("ERR2", err)
   })
 }
 

lib/agent/actions/fileretrieval/upload.js

@@ -37,7 +37,6 @@ function main() {
   }
   Main(options, function(err) {
     if (err) {
-      console.error(err);
       return;
     }
   });
@@ -89,7 +88,6 @@ function upload_file(file, buf, cb) {
 
   needle.post(url, buf, options, function(err, res) {
     if (err) {
-      console.log(err);
       cb(err);
       return;
     }

lib/agent/actions/triggers/index.js

@@ -301,7 +301,6 @@ exports.activate_event = (trigger) => {
 }
 
 exports.activate = (trigger) => {
-  console.log("ACTIVATE!!!", trigger)
   try {
     var index = trigger.automation_events.findIndex(obj => obj.type === 'exact_time' || obj.type === 'repeat_time'),
         info  = trigger.automation_events[index].info,
@@ -316,19 +315,12 @@ exports.activate = (trigger) => {
     if (isNaN(opts)) return 2;
 
     var current_date = new Date().getTime();
-    console.log("DATE!", current_date, opts, current_date > opts)
 
     if (current_date > opts) {
-      console.log("WEAAAA", trigger.persist, !trigger.last_exec)
-
-
       if (trigger.persist && !trigger.last_exec) {
-        console.log("RUN TRIGGER ACTIONS COSO")
         run_trigger_actions(trigger);
         return 6;
-
       } else {
-        console.log("ELSE!!!")
         return 3;
       }
     }
@@ -390,7 +382,6 @@ exports.activate = (trigger) => {
     var range = {from : date_from, until: date_until};
   }
 
-  console.log("SCHEDULE!!", opts)
   var da_trigger = schedule.scheduleJob(opts, () => {
     var date = new Date();
 
@@ -408,8 +399,6 @@ exports.activate = (trigger) => {
 
       if (isNaN(date_from) || isNaN(date_until) || date.getTime() < date_from || date.getTime() > date_until) return;
     }
-
-    console.log("RUN THIS!", trigger)
     run_trigger_actions(trigger);
   });
 
@@ -463,7 +452,6 @@ exports.sync = (err, triggers, stored) => {
 
     try {
       if (trigger.automation_events.some(obj => obj.type === 'exact_time' || obj.type === 'repeat_time')) {
-        console.log("EXACT TRIGGER!!",trigger)
         state = exports.activate(trigger);
       }else
         state = exports.activate_event(trigger);

lib/agent/actions/wipe/runner.js

@@ -23,7 +23,6 @@ wipe.fetch_dirs(what, to_erase, to_kill, null, (err) => {
   if (err) last_err = err;
   wipe.wipeout((err, out) => {
     if (err) last_err = err;
-    console.log(out)
     process.exit();
   })
 })

lib/agent/actions/wipe/wipe.js

@@ -94,7 +94,6 @@ exports.cookies = (cb) => {
   var browsers = ['chrome', 'firefox', 'iexplore', 'chromium'];
   gather('browsers', () => {
     // Execute taskkill to all browsers before wipping
-    console.log("CALL KILL TASKS!!!")
     os_wipe.killTasks(browsers, (err, out) => {
       if (err) write('Error closing browser applications: ' + err.toString());
 

lib/agent/commands.js

@@ -103,7 +103,6 @@ exports.parse = function(body) {
 }
 
 exports.perform = function(command) {
-  console.log("PERFORM!!", command)
   if (!command)
     return handle_error(new Error('No command received'));
 
@@ -115,8 +114,6 @@ exports.perform = function(command) {
     id = command.options.messageID;
   else 
     id = uuidv4();
-
-  console.log("EL ID!!", id)
 
   if (command.body)
     command = command.body;
@@ -175,11 +172,8 @@ exports.perform = function(command) {
 
   if (method) {
     hooks.trigger('command', method, command.target, command.options);
-    //console.log("METHOD!!", method.toString())
-    console.log("comand!!", command)
     if (command.command != 'start'){
       if (command.command=='get' || command.command=='report' || command.command == 'cancel'
-      //&& (command.target=='users_list' || command.target=='tree'|| command.target=='location')
       ) {
         method(command.target, command.options);
       }
@@ -268,16 +262,13 @@ var watch_stopped = function() {
   hooks.on('action', function(event, id) { 
     if (event == 'stopped' || event == 'failed') {
       new_storage.do('update', { type: 'commands', id: id, columns: 'stopped', values: new Date().toISOString() }, (err) => {
-        console.log("ERR2", err)  //
       })
     }
 
     if (event == 'started') {
       new_storage.do('update', { type: 'commands', id: id, columns: 'started', values: new Date().toISOString() }, (err) => {
-        console.log("ERR2", err)  //
       })
     }
-      // remove('start', name);
   });
 
   hooks.on('trigger', function(event, name) {

lib/agent/plugin.js

@@ -30,8 +30,6 @@ function visible(plugin_name) {
 }
 
 var scoped_config = function(plugin_name) {
-  // console.log('Scoped config for ' + plugin_name);
-
   function nested_key(key) {
     return typeof key == 'object' || key.indexOf('.') !== -1
   }

lib/agent/plugins/console/completer.js

@@ -5,7 +5,6 @@ var help  = require('./help');
 
 var debug = function(str) {
   if (process.env.DEBUG)
-    console.log(str);
 }
 
 // Use completions from help.js where line starts with a space or tab.

lib/agent/plugins/console/index.js

@@ -44,8 +44,6 @@ var say = function(message, data) {
   var str = data
       ? message + " received:\n\n" + JSON.stringify(data, null, 2)
       : message;
-
-  console.log(str);
 };
 
 var paste = function(message, data) {

lib/agent/plugins/control-panel/index.js

@@ -62,7 +62,6 @@ function boot(cb) {
   sync();
   long_polling.load.call(common, function(err, emitter) {
     if (!emitter) return;
-    console.log("EMIITTTER CP", emitter)
     emitter.on('command', commands.perform);
   });
   cb && cb();

lib/agent/reports.js

@@ -70,7 +70,6 @@ var map = function(cb) {
 };
 
 var get = function(report_name, options, callback) {
-  console.log("GET", report_name, options)
 
   if (typeof options == 'function') {
     var cb = options;

lib/agent/triggers/network/index.js

@@ -13,7 +13,6 @@ var emitter,
 var get_current = (list) => {
   list.forEach(field => {
     providers.get(field, (err, data) => {
-      // console.log(field + ' -> ' + data);
       current[field] = data;
     })
   })
@@ -32,7 +31,6 @@ var check_if_changed = (field, event) => {
     // emitter may be null if trigger is stopped while getting data
     if (err || !data || !emitter) return done(err);
 
-    // console.log(field + ' -> ' + data);
     if (current[field] != data)
       emitter.emit(event, data);
 

lib/agent/triggers/power/index.js

@@ -16,9 +16,6 @@ var check_battery_status = (first) => {
   providers.get('battery_status', (err, current) => {
     if (err || !emitter) return;
 
-    // console.log('Current: ' + current.state);
-    // console.log('Previous: ' + previous.state);
-
     if (first) return previous = current;
 
     // On mac we check 3 more times the battery status because of the realization time.

lib/system/mac/index.js

@@ -22,7 +22,6 @@ var get_logged_user_pid = function() {
 
   cp.exec(cmd, function(err, stdout, stderr){
     process.env.LOGGED_USER_PID = stdout.toString().trim();
-    // console.log("Logged user PID is " + process.env.LOGGED_USER_PID);
   });
 };
 

lib/system/utils/runner.js

@@ -19,12 +19,9 @@ if (!run_as || !command) {
   process.exit(1);
 }
 
-// console.log('Current uid: ' + process.getuid());
 
 var run_command = function(command, args){
 
-  // console.log("Running " + command + " with uid " + process.getuid());
-
   var opts = { env: process.env }
 
   if (process.platform == 'linux' && !opts.env.DISPLAY)
@@ -57,7 +54,6 @@ var safe_escape = function(str) {
 
 try {
   process.setuid(run_as);
-  // console.log('New uid: ' + process.getuid());
 } catch (err) {
   if (process.platform != 'win32') {
     args = args.map(function(a){ return safe_escape(a); })

test/lib/agent/actions/diskencryption.js

@@ -78,7 +78,6 @@ describe('diskencryption', () => {
         it('returns error', (done) => {
           diskencryption.start(id,opts, (err, em) => {
             em.on('end', (id,err, out) => {
-              console.log("error;",err)
               should.exist(err);
               err.message.should.containEql('Admin service not available');
               done();

test/lib/agent/actions/geofencing.js

@@ -212,7 +212,6 @@ describe('geofencing', function() {
         describe('and theres nothing being watched', function() {
           before(function() {
             push_stub = sinon.stub(push, 'response').callsFake((data, opts, cb) => {
-              console.log(data)
               push_data = data
               return true;
             });
@@ -262,7 +261,6 @@ describe('geofencing', function() {
         describe('and theres new fences compared with the stored', function() {
           before(function() {
             push_stub = sinon.stub(push, 'response').callsFake((data, opts, cb) => {
-              console.log(data)
               push_data = data
               return true;
             });
@@ -318,7 +316,6 @@ describe('geofencing', function() {
         describe('and theres less fences compared with the stored and one new', function() {
           before(function() {
             push_stub = sinon.stub(push, 'response').callsFake((data, opts, cb) => {
-              console.log(data)
               push_data = data
               return true;
             });
@@ -370,7 +367,6 @@ describe('geofencing', function() {
         describe('and theres no new fences comparing with the stored', function() {
           before(function() {
             push_stub = sinon.stub(push, 'response').callsFake((data, opts, cb) => {
-              console.log(data)
               push_data = data
               return true;
             });
@@ -421,7 +417,6 @@ describe('geofencing', function() {
         describe('and theres no fences now', function() {
           before(function() {
             push_stub = sinon.stub(push, 'response').callsFake((data, opts, cb) => {
-              console.log(data)
               push_data = data
               return true;
             });

test/lib/agent/actions/triggers.js

@@ -15,7 +15,6 @@ var helpers          = require('./../../../helpers'),
     commands         = require(join(lib_path, 'agent', 'commands')),
     actions          = require(join(lib_path, 'agent', 'actions')),
     triggers_storage = require(join(triggers_path, 'storage')),
-    // storage          = require(join(lib_path, 'agent', 'utils', 'storage')),
     storage2         = require(join(lib_path, 'agent', 'utils', 'commands_storage')),
     lp               = require(join(lib_path, 'agent', 'plugins', 'control-panel', 'long-polling')),
     dummy            = require('./fixtures/triggers_responses');
@@ -180,11 +179,9 @@ describe('triggers', () => {
             // device date
             // date = new Date(),
             // year = date.getFullYear() + 1,   // Always next year
-            // console.log("YEAR!!", year)
             // timezone_offset = new Date().getTimezoneOffset() * 60 * 1000,
             // new_date = new Date(Date.UTC(year, 6, 25, 15, 00, 05)).getTime() + timezone_offset;
             new_date = 1918330449000;
-            console.log("NEW DATE!", new_date)
             setTimeout(() => { triggers.start({}, done) }, 500)
             clock = sinon.useFakeTimers(new_date);
           })
@@ -197,7 +194,6 @@ describe('triggers', () => {
           })
 
           it('does not set up the trigger in the past', (done) => {
-            console.log("TEST1!!!")
             clock.tick(300);
             spy_perform.notCalled.should.be.equal(true);
             spy_logger.calledOnce.should.be.equal(true);
@@ -206,9 +202,7 @@ describe('triggers', () => {
           })
 
           it('executes the action at the right time', (done) => {
-            console.log("TEST2!!!")
             clock.tick(1001);
-            console.log("NEW DATE!", new Date().getTime())
             spy_perform.calledOnce.should.be.equal(true);
             spy_perform.getCall(0).args[0].target.should.be.equal('alert');
             spy_perform.getCall(0).args[0].options.trigger_id.should.exists;

test/lib/agent/utils/commands_storage.js

@@ -212,13 +212,8 @@ describe('storage', () => {
 
     it('modify zone state when update', (done) => {
       storage.do('update', { type: 'geofences', id: 1234, columns: 'state', values: 'state' }, (err) => {
-      // storage.update('geofences', 1234, 'state', 'state', () => {
         storage.do('query', { type: 'geofences', column: 'id', data: 1234}, (err, data) => {
-        // storage.query('geofences', 'id', 1234, (err, out) => {
           storage.do('all', {type: 'geofences'}, (err, zonas) => {
-          // storage.all('geofences', (err, zonas) => {
-            console.log("ALL ZONAS", zonas)
-            console.log("QUERY", err, zonas)
             done();
           });
         })
@@ -308,7 +303,6 @@ describe('storage', () => {
 
   describe('store keys', () => {
     before(function(done) {
-      console.log("TPM DIR!!", tmpdir())
       storage.init('geofences', tmpdir() + '/bar.db', done);
     })
     it('store the key', (done) => {
@@ -401,7 +395,6 @@ describe('storage', () => {
 
     it('queue', (done) => {
       storage.do('set', { type: 'commands', id: id3, data: data3 }, () => {console.log("TERMINÓ EL SET1")});
-      // console.log("OEOEOE")
       storage.do('set', { type: 'commands', id: id4, data: data3}, () => {console.log("TERMINÓ EL SET2")});
 
       setTimeout(() => {

test/lib/conf/cli.js

@@ -525,7 +525,6 @@ describe('config cli arguments', function() {
           var attrs = ['--name', 'User', '--email', '[email protected]', '--password', 'buenaonda', '--terms', 'yes', '--age', 'yes'];
 
           helpers.run_cli(['config', 'account', 'signup'].concat(attrs), function(code, out, err) {
-            console.log(err);
             code.should.eql(1);
             out.should.containEql('panel.signup called with opts');
             out.should.containEql('{"name":"User","email":"[email protected]"');

test/lib/system/as_logged_user_spec.js

@@ -18,8 +18,6 @@ describe('as_logged_user()', function(){
       logged_user_stub,
       current_user = process.env.USER;
 
-  // console.log('Current user: ' + current_user);
-
   describe('run', function() {
 
     function run(cmd, args, cb) {

test/utils/spawner_sandbox.js

@@ -40,7 +40,6 @@ exports.put = function(file, deps, vars, cb) {
       if (err) return cb(err);
 
       var modified = replace_deps(data.toString(), deps);
-      // console.log(modified);
 
       fs.rename(file, file + '.original', function(err) {
         if (err) return cb(err);