Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 10:45:47 +00:00
Code Issues Projects Releases Wiki Activity

feature(tryRequire) name, callback -> name, options

Browse source
This commit is contained in:
coderaiser 2014-09-22 07:33:06 -04:00
parent 4d8adf3ed9
commit 30ea708d09
6 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/cloudcmd.js
View file

@ -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,

2
lib/server.js
View file

@ -14,7 +14,7 @@
tryRequire = require(DIR_SERVER + 'tryRequire'),
io = tryRequire('socket.io');
io = tryRequire('socket.io', {log: true});
/**
* start server function

2
lib/server/auth.js
View file

@ -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'),

2
lib/server/config.js
View file

@ -12,7 +12,7 @@
ConfigPath = DIR + 'json/config.json',
config = tryRequire(ConfigPath) || {};
config = tryRequire(ConfigPath, {log: true}) || {};
module.exports = function(key, value) {
var result;

6
lib/server/terminal.js
View file

@ -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,

8
lib/server/tryRequire.js
View file

@ -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;
};