From a46fb5fa202ecc1d98b3df4b28784f09e7cac278 Mon Sep 17 00:00:00 2001 From: hzxuzhonghu Date: Tue, 3 Nov 2015 17:28:37 +0800 Subject: [PATCH] fix jshint error --- gruntfile.js | 3 ++- lib/monitors/common/cmd.js | 24 ++++++++++++------------ lib/monitors/zookeepermonitor.js | 13 +++++++------ lib/pomelo.js | 1 + test/modules/cmd.js | 8 ++++---- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/gruntfile.js b/gruntfile.js index 91246f503..e00da13ab 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -38,7 +38,8 @@ module.exports = function(grunt) { jshint: { all: ['lib/*'], options: { - node: true + node: true, + sub: true } } }); diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js index f8ba9c91e..5a1a1b08e 100644 --- a/lib/monitors/common/cmd.js +++ b/lib/monitors/common/cmd.js @@ -8,11 +8,11 @@ var util = require('util'); Command.init = function(client, data) { logger.debug('server: %s receive command, with data: %j', client.app.serverId, data); if(!data) { - logger.warn('server: %s command data is null.', client.app.serverId); - return; - } - data = JSON.parse(data); - switch(data.command) { + logger.warn('server: %s command data is null.', client.app.serverId); + return; + } + data = JSON.parse(data); + switch(data.command) { case 'stop': stop(client); break; @@ -94,7 +94,7 @@ var set = function(client, msg) { var get = function(client, msg) { var value = client.app.get(msg.param); if (!checkJSON(value)) { - value = 'object'; + value = 'object'; } logger.info('get %s the value is %s in server %s', msg.param, value, client.app.serverId); @@ -147,7 +147,7 @@ var exec = function(client, msg) { } } catch (e) { logger.error('exec %s in server %s with err %s', msg.script, client.app.serverId, e.toString()); - client.sendCommandResult(e.toString()) + client.sendCommandResult(e.toString()); } }; @@ -183,7 +183,7 @@ var show = function(client, msg) { break; } client.sendCommandResult(JSON.stringify(result)); -} +}; var getConnectionInfo = function(client) { var connectionInfo = {}; @@ -204,7 +204,7 @@ var getProxyInfo = function(client) { var proxies = __proxy__.client.proxies.user; var server = client.app.getServerById(client.app.serverId); if (!server) { - cb('no server with this id ' + client.app.serverId); + logger.error('no server with this id ' + client.app.serverId); } else { var type = server['serverType']; var tmp = proxies[type]; @@ -232,7 +232,7 @@ var getHandlerInfo = function(client) { var handles = __server__.server.handlerService.handlers; var server = client.app.getServerById(client.app.serverId); if (!server) { - cb('no server with this id ' + client.app.serverId); + logger.error('no server with this id ' + client.app.serverId); } else { var type = server['serverType']; var tmp = handles; @@ -258,7 +258,7 @@ var getComponentInfo = function(client) { var res = {}; for (var key in _components) { var name = getComponentName(key); - res[name] = clone(name, client.app.get(name + 'Config')) + res[name] = clone(name, client.app.get(name + 'Config')); } return {componentInfo: res}; }; @@ -329,4 +329,4 @@ function checkJSON(obj) { return false; } return true; -}; \ No newline at end of file +} diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js index 69239d344..509ae9b4a 100644 --- a/lib/monitors/zookeepermonitor.js +++ b/lib/monitors/zookeepermonitor.js @@ -209,7 +209,7 @@ var getProxyInfo = function(zk) { var proxies = __proxy__.client.proxies.user; var server = zk.app.getServerById(zk.app.serverId); if (!server) { - cb('no server with this id ' + zk.app.serverId); + logger.error('no server with this id ' + zk.app.serverId); } else { var type = server['serverType']; var tmp = proxies[type]; @@ -237,7 +237,7 @@ var getHandlerInfo = function(zk) { var handles = __server__.server.handlerService.handlers; var server = zk.app.getServerById(zk.app.serverId); if (!server) { - cb('no server with this id ' + zk.app.serverId); + logger.error('no server with this id ' + zk.app.serverId); } else { var type = server['serverType']; var tmp = handles; @@ -263,7 +263,7 @@ var getComponentInfo = function(zk) { var res = {}; for (var key in _components) { var name = getComponentName(key); - res[name] = clone(name, zk.app.get(name + 'Config')) + res[name] = clone(name, zk.app.get(name + 'Config')); } return res; }; @@ -308,7 +308,7 @@ function clone(param, obj) { // return 'no ' + param + 'Config info'; } return result; -}; +} function getComponentName(c) { var t = c.match(/^__(\w+)__$/); @@ -316,7 +316,7 @@ function getComponentName(c) { t = t[1]; } return t; -}; +} function checkJSON(obj) { if (!obj) { @@ -328,7 +328,7 @@ function checkJSON(obj) { return false; } return true; -}; +} var createAllNode = function(zk, value, mode, cb) { async.series([ @@ -483,3 +483,4 @@ var reconnect = function(self) { } ); }; + diff --git a/lib/pomelo.js b/lib/pomelo.js index 960aac640..d8c6fe773 100644 --- a/lib/pomelo.js +++ b/lib/pomelo.js @@ -79,6 +79,7 @@ Pomelo.monitors.__defineGetter__('redismonitor', load.bind(null, './monitors/red */ Pomelo.createApp = function (opts) { var app = application; + console.log('--------',application); app.init(opts); Pomelo.app = app; return app; diff --git a/test/modules/cmd.js b/test/modules/cmd.js index 4636e7ea5..28333270f 100644 --- a/test/modules/cmd.js +++ b/test/modules/cmd.js @@ -31,7 +31,7 @@ describe('cmd test', function() { } }; - var data = {command: 1}; + var data = {command: 'stop'}; commander.init(client, JSON.stringify(data)); flag.should.eql(true); /* @@ -39,7 +39,7 @@ describe('cmd test', function() { commander.init(client, JSON.stringify(data)); flag.should.eql(true); */ - data = {command: 3, cron: { + data = {command: 'addCron', cron: { type: 'chat', id: 'chat-server-1' } @@ -47,7 +47,7 @@ describe('cmd test', function() { commander.init(client, JSON.stringify(data)); rs.length.should.eql(1); - data = {command: 4, cron: { + data = {command: 'removeCron', cron: { type: 'chat', id: 'chat-server-1' } @@ -55,7 +55,7 @@ describe('cmd test', function() { commander.init(client, JSON.stringify(data)); rs.length.should.eql(1); - data = {command: 5, blacklist: ['127.0.0.1'] }; + data = {command: 'blacklist', blacklist: ['127.0.0.1'] }; commander.init(client, JSON.stringify(data)); client.app.components.__connector__.blacklist.length.should.eql(1); });