diff --git a/lib/cloudcmd.js b/lib/cloudcmd.js index ddab7352..ab8c72b7 100644 --- a/lib/cloudcmd.js +++ b/lib/cloudcmd.js @@ -29,10 +29,7 @@ return emptyFunc; }; - webconsole = tryRequire('console-io', function(error) { - if (error) - Util.log(error.message); - }) || emptyFunc; + webconsole = tryRequire('console-io', {log: true}) || emptyFunc; module.exports = function(params) { var keys, diff --git a/lib/server.js b/lib/server.js index a6dd9fcc..07b1a7a9 100644 --- a/lib/server.js +++ b/lib/server.js @@ -14,7 +14,7 @@ tryRequire = require(DIR_SERVER + 'tryRequire'), - io = tryRequire('socket.io'); + io = tryRequire('socket.io', {log: true}); /** * start server function diff --git a/lib/server/auth.js b/lib/server/auth.js index b0de6da1..877371f2 100644 --- a/lib/server/auth.js +++ b/lib/server/auth.js @@ -5,7 +5,7 @@ DIR_LIB = DIR + '../', crypto = require('crypto'), - tryRequire = require(DIR + 'tryRequire'), + tryRequire = require(DIR + 'tryRequire', {log: true}), config = require(DIR + 'config'), Util = require(DIR_LIB + 'util'), diff --git a/lib/server/config.js b/lib/server/config.js index db0e52ac..62fa87b2 100644 --- a/lib/server/config.js +++ b/lib/server/config.js @@ -12,7 +12,7 @@ ConfigPath = DIR + 'json/config.json', - config = tryRequire(ConfigPath) || {}; + config = tryRequire(ConfigPath, {log: true}) || {}; module.exports = function(key, value) { var result; diff --git a/lib/server/terminal.js b/lib/server/terminal.js index 1430a0c0..8bc98c36 100644 --- a/lib/server/terminal.js +++ b/lib/server/terminal.js @@ -9,10 +9,10 @@ tryRequire = require('./tryRequire.js'), - pty = tryRequire('pty.js', function(error) { - if (error) - Util.log(error.message); + pty = tryRequire('pty.js', { + log: true }), + Clients = [], CHANNEL = CloudFunc.CHANNEL_TERMINAL, diff --git a/lib/server/tryRequire.js b/lib/server/tryRequire.js index ab57c3b5..16f7c2eb 100644 --- a/lib/server/tryRequire.js +++ b/lib/server/tryRequire.js @@ -3,16 +3,16 @@ var Util = require('../util'); - module.exports = function(name, callback) { + module.exports = function tryRequire(name, options) { var module, - isFunc = typeof callback === 'function', + o = options || {}, error = Util.exec.try(function() { module = require(name); }); - if (error && isFunc) - callback(error); + if (error && o.log) + Util.log(error.message); return module; };