2.x

bin/pomelo

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+"use strict";
+
 /**
  * Module dependencies.
  */
@@ -9,40 +11,25 @@ var fs = require('fs'),
   util = require('util'),
   cliff = require('cliff'),
   mkdirp = require('mkdirp'),
-  co = require('../lib/modules/console'),
   utils = require('../lib/util/utils'),
-  starter = require('../lib/master/starter'),
   exec = require('child_process').exec,
   spawn = require('child_process').spawn,
   version = require('../package.json').version,
-  adminClient = require('pomelo-admin').adminClient,
   constants = require('../lib/util/constants'),
   program = require('commander');
 
 /**
  *  Constant Variables
  */
 var TIME_INIT = 1 * 1000;
-var TIME_KILL_WAIT = 5 * 1000;
-var KILL_CMD_LUX = 'kill -9 `ps -ef|grep node|awk \'{print $2}\'`';
-var KILL_CMD_WIN = 'taskkill /im node.exe /f';
 
 var CUR_DIR = process.cwd();
 var DEFAULT_GAME_SERVER_DIR = CUR_DIR;
-var DEFAULT_USERNAME = 'admin';
-var DEFAULT_PWD = 'admin';
-var DEFAULT_ENV = 'development';
-var DEFAULT_MASTER_HOST = '127.0.0.1';
-var DEFAULT_MASTER_PORT = 3005;
 
-var CONNECT_ERROR = 'Fail to connect to admin console server.';
 var FILEREAD_ERROR = 'Fail to read the file, please check if the application is started legally.';
 var CLOSEAPP_INFO = 'Closing the application......\nPlease wait......';
-var ADD_SERVER_INFO = 'Successfully add server.';
-var RESTART_SERVER_INFO = 'Successfully restart server.';
 var INIT_PROJ_NOTICE = '\nThe default admin user is: \n\n'+ '  username'.green + ': admin\n  ' + 'password'.green+ ': admin\n\nYou can configure admin users by editing adminUser.json later.\n ';
 var SCRIPT_NOT_FOUND = 'Fail to find an appropriate script to run,\nplease check the current work directory or the directory specified by option `--directory`.\n'.red;
-var MASTER_HA_NOT_FOUND = 'Fail to find an appropriate masterha config file, \nplease check the current work directory or the arguments passed to.\n'.red;
 var COMMAND_ERROR = 'Illegal command format. Use `pomelo --help` to get more info.\n'.red;
 var DAEMON_INFO = 'The application is running in the background now.\n';
 
@@ -54,86 +41,6 @@ program.command('init [path]')
     init(path || CUR_DIR);
   });
 
-program.command('start')
-  .description('start the application')
-  .option('-e, --env <env>', 'the used environment', DEFAULT_ENV)
-  .option('-D, --daemon', 'enable the daemon start')
-  .option('-d, --directory, <directory>', 'the code directory', DEFAULT_GAME_SERVER_DIR)
-  .option('-t, --type <server-type>,', 'start server type')
-  .option('-i, --id <server-id>', 'start server id')
-  .action(function(opts) {
-    start(opts);
-  });
-
-program.command('list')
-  .description('list the servers')
-  .option('-u, --username <username>', 'administration user name', DEFAULT_USERNAME)
-  .option('-p, --password <password>', 'administration password', DEFAULT_PWD)
-  .option('-h, --host <master-host>', 'master server host', DEFAULT_MASTER_HOST)
-  .option('-P, --port <master-port>', 'master server port', DEFAULT_MASTER_PORT)
-  .action(function(opts) {
-    list(opts);
-  });
-
-program.command('add')
-  .description('add a new server')
-  .option('-u, --username <username>', 'administration user name', DEFAULT_USERNAME)
-  .option('-p, --password <password>', 'administration password', DEFAULT_PWD)
-  .option('-h, --host <master-host>', 'master server host', DEFAULT_MASTER_HOST)
-  .option('-P, --port <master-port>', 'master server port', DEFAULT_MASTER_PORT)
-  .action(function() {
-    var args = [].slice.call(arguments, 0);
-    var opts = args[args.length - 1];
-    opts.args = args.slice(0, -1);
-    add(opts);
-  });
-
-program.command('stop')
-  .description('stop the servers, for multiple servers, use `pomelo stop server-id-1 server-id-2`')
-  .option('-u, --username <username>', 'administration user name', DEFAULT_USERNAME)
-  .option('-p, --password <password>', 'administration password', DEFAULT_PWD)
-  .option('-h, --host <master-host>', 'master server host', DEFAULT_MASTER_HOST)
-  .option('-P, --port <master-port>', 'master server port', DEFAULT_MASTER_PORT)
-  .action(function() {
-    var args = [].slice.call(arguments, 0);
-    var opts = args[args.length - 1];
-    opts.serverIds = args.slice(0, -1);
-    terminal('stop', opts);
-  });
-
-program.command('kill')
-  .description('kill the application')
-  .option('-u, --username <username>', 'administration user name', DEFAULT_USERNAME)
-  .option('-p, --password <password>', 'administration password', DEFAULT_PWD)
-  .option('-h, --host <master-host>', 'master server host', DEFAULT_MASTER_HOST)
-  .option('-P, --port <master-port>', 'master server port', DEFAULT_MASTER_PORT)
-  .option('-f, --force', 'using this option would kill all the node processes')
-  .action(function() {
-    var args = [].slice.call(arguments, 0);
-    var opts = args[args.length - 1];
-    opts.serverIds = args.slice(0, -1);
-    terminal('kill', opts);
-  });
-
-program.command('restart')
-  .description('restart the servers, for multiple servers, use `pomelo restart server-id-1 server-id-2`')
-  .option('-u, --username <username>', 'administration user name', DEFAULT_USERNAME)
-  .option('-p, --password <password>', 'administration password', DEFAULT_PWD)
-  .option('-h, --host <master-host>', 'master server host', DEFAULT_MASTER_HOST)
-  .option('-P, --port <master-port>', 'master server port', DEFAULT_MASTER_PORT)
-  .option('-t, --type <server-type>,', 'start server type')
-  .option('-i, --id <server-id>', 'start server id')
-  .action(function(opts) {
-    restart(opts);
-  });
-
-program.command('masterha')
-  .description('start all the slaves of the master')
-  .option('-d, --directory <directory>', 'the code directory', DEFAULT_GAME_SERVER_DIR)
-  .action(function(opts) {
-    startMasterha(opts);
-  });
-
 program.command('*')
   .action(function() {
     console.log(COMMAND_ERROR);
@@ -369,161 +276,6 @@ function start(opts) {
   }
 }
 
-/**
- * List pomelo processes.
- *
- * @param {Object} opts options for `list` operation
- */
-function list(opts) {
-  var id = 'pomelo_list_' + Date.now();
-  connectToMaster(id, opts, function(client) {
-    client.request(co.moduleId, {signal: 'list'}, function(err, data) {
-      if(err) {
-        console.error(err);
-      }
-      var servers = [];
-      for(var key in data.msg) {
-        servers.push(data.msg[key]);
-      }
-      var comparer = function(a, b) {
-        if (a.serverType < b.serverType) {
-          return -1;
-        } else if (a.serverType > b.serverType) {
-          return 1;
-        } else if (a.serverId < b.serverId) {
-          return -1;
-        } else if (a.serverId > b.serverId) {
-          return 1;
-        } else {
-          return 0;
-        }
-      };
-      servers.sort(comparer);
-      var rows = [];
-      rows.push(['serverId', 'serverType', 'pid', 'rss(M)', 'heapTotal(M)', 'heapUsed(M)', 'uptime(m)']);
-      servers.forEach(function(server) {
-        rows.push([server.serverId, server.serverType, server.pid, server.rss, server.heapTotal, server.heapUsed, server.uptime]);
-      });
-      console.log(cliff.stringifyRows(rows, ['red', 'blue', 'green', 'cyan', 'magenta', 'white', 'yellow']));
-      process.exit(0);
-    });
-  });
-}
-
-/**
- * Add server to application.
- *
- * @param {Object} opts options for `add` operation
- */
-function add(opts) {
-  var id = 'pomelo_add_' + Date.now();
-  connectToMaster(id, opts, function(client) {
-    client.request(co.moduleId, { signal: 'add', args: opts.args }, function(err) {
-      if(err) {
-        console.error(err);
-      }
-      else {
-        console.info(ADD_SERVER_INFO);
-      }
-      process.exit(0);
-    });
-  });
-}
-
-/**
- * Terminal application.
- *
- * @param {String} signal stop/kill
- * @param {Object} opts options for `stop/kill` operation
- */
-function terminal(signal, opts) {
-  console.info(CLOSEAPP_INFO);
-  // option force just for `kill`
-  if(opts.force) {
-    if (os.platform() === constants.PLATFORM.WIN) {
-      exec(KILL_CMD_WIN);
-    } else {
-      exec(KILL_CMD_LUX);
-    }
-    process.exit(1);
-    return;
-  }
-  var id = 'pomelo_terminal_' + Date.now();
-  connectToMaster(id, opts, function(client) {
-    client.request(co.moduleId, {
-      signal: signal, ids: opts.serverIds
-    }, function(err, msg) {
-      if(err) {
-        console.error(err);
-      }
-      if(signal === 'kill') {
-        if(msg.code === 'ok') {
-          console.log('All the servers have been terminated!');
-        } else {
-          console.log('There may be some servers remained:', msg.serverIds);
-        }
-      }
-      process.exit(0);
-    });
-  });
-}
-
-function restart(opts) {
-  var id = 'pomelo_restart_' + Date.now();
-  var serverIds = [];
-  var type = null;
-  if(!!opts.id) {
-    serverIds.push(opts.id);
-  }
-  if(!!opts.type) {
-    type = opts.type;
-  }
-  connectToMaster(id, opts, function(client) {
-    client.request(co.moduleId, { signal: 'restart', ids: serverIds, type: type}, function(err, fails) {
-      if(!!err) {
-        console.error(err);
-      } else if(!!fails.length) {
-        console.info('restart fails server ids: %j', fails);
-      } else {
-        console.info(RESTART_SERVER_INFO);
-      }
-      process.exit(0);
-    });
-  });
-}
-
-function connectToMaster(id, opts, cb) {
-  var client = new adminClient({username: opts.username, password: opts.password, md5: true});
-  client.connect(id, opts.host, opts.port, function(err) {
-    if(err) {
-      abort(CONNECT_ERROR + err.red);
-    }
-    if(typeof cb === 'function') {
-      cb(client);
-    }
-  });
-}
-
-/**
- * Start master slaves.
- *
- * @param {String} option for `startMasterha` operation
- */
-function startMasterha(opts) {
-  var configFile = path.join(opts.directory, constants.FILEPATH.MASTER_HA);
-  if(!fs.existsSync(configFile)) {
-    abort(MASTER_HA_NOT_FOUND);
-  }
-  var masterha = require(configFile).masterha;
-  for(var i=0; i<masterha.length; i++) {
-    var server = masterha[i];
-    server.mode = constants.RESERVED.STAND_ALONE;
-    server.masterha = 'true';
-    server.home = opts.directory;
-    runServer(server);
-  }
-}
-
 /**
  * Check if the given directory `path` is empty.
  *
@@ -617,7 +369,7 @@ function copy(origin, target) {
  * @param {Function} fn
  */
 function mkdir(path, fn) {
-  mkdirp(path, 0755, function(err){
+  mkdirp(path, '0755', function(err){
     if(err) {
       throw err;
     }
@@ -653,29 +405,4 @@ function connectorType(cb) {
          break;
     }
   });
-}
-
-/**
- * Run server.
- * 
- * @param {Object} server server information
- */
-function runServer(server) {
-  var cmd, key;
-  var main = path.resolve(server.home, 'app.js');
-  if(utils.isLocal(server.host)) {
-    var options = [];
-    options.push(main);
-    for(key in server) {
-      options.push(util.format('%s=%s', key, server[key]));
-    }
-    starter.localrun(process.execPath, null, options);
-  } else {
-    cmd = util.format('cd "%s" && "%s"', server.home, process.execPath);
-    cmd += util.format(' "%s" ', main);
-    for(key in server) {
-      cmd += util.format(' %s=%s ', key, server[key]);
-    }
-    starter.sshrun(cmd, server.host);
-  }
 }

gruntfile.js

@@ -9,6 +9,7 @@ module.exports = function(grunt) {
   var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
   'test/remote/*.js', 'test/service/*.js', 'test/modules/*.js', 'test/util/*.js', 'test/*.js'];
 
+
   // Project configuration.
   grunt.initConfig({
     mochaTest: {
@@ -35,10 +36,14 @@ module.exports = function(grunt) {
       }
     },
     jshint: {
-      all: ['lib/*']
+      all: ['lib/*'],
+      options: {
+                 node: true,
+                 sub: true
+               }
     }
   });
 
   // Default task.
   grunt.registerTask('default', ['clean', 'mochaTest', 'jshint']);
-};
+};

index.js

@@ -1 +1,2 @@
+'use strict';
 module.exports = require('./lib/pomelo');