wip

Unitech · Mar 4, 2017 · 775f0ca · 775f0ca
1 parent 917c960
commit 775f0ca
Show file tree

Hide file tree

Showing 26 changed files with 1,511 additions and 1,803 deletions.
diff --git a/constants.js b/constants.js
@@ -52,21 +52,22 @@ var csts = {
   CLUSTER_MODE_ID         : 'cluster_mode',
   FORK_MODE_ID            : 'fork_mode',
 
-  KEYMETRICS_ROOT_URL     : process.env.KEYMETRICS_NODE || 'root.keymetrics.io',
+  KEYMETRICS_ROOT_URL     : process.env.KEYMETRICS_NODE || 'https://root.keymetrics.io',
   KEYMETRICS_BANNER       : '../lib/keymetrics',
-  DEFAULT_MODULE_JSON     : 'package.json',
 
-  REMOTE_PORT_TCP         : isNaN(parseInt(process.env.KEYMETRICS_PUSH_PORT)) ? 80 : parseInt(process.env.KEYMETRICS_PUSH_PORT),
-  REMOTE_PORT             : 41624,
-  REMOTE_REVERSE_PORT     : isNaN(parseInt(process.env.KEYMETRICS_REVERSE_PORT)) ? 43554 : parseInt(process.env.KEYMETRICS_REVERSE_PORT),
-  REMOTE_HOST             : 's1.keymetrics.io',
-  SEND_INTERVAL           : 1000,
-  GRACEFUL_TIMEOUT        : parseInt(process.env.PM2_GRACEFUL_TIMEOUT) || 8000,
-  GRACEFUL_LISTEN_TIMEOUT : parseInt(process.env.PM2_GRACEFUL_LISTEN_TIMEOUT) || 3000,
+  PROTOCOL_VERSION        : 1,
+  COMPRESS_PROTOCOL       : false,
+  STATUS_INTERVAL         : 1000,
+
   LOGS_BUFFER             : 10,
   CONTEXT_ON_ERROR        : 2,
   AGGREGATION_DURATION    : process.env.PM2_DEBUG || process.env.NODE_ENV === 'test' || process.env.NODE_ENV === 'development' ? 0 : 60 * 10,
 
+  GRACEFUL_TIMEOUT        : parseInt(process.env.PM2_GRACEFUL_TIMEOUT) || 8000,
+  GRACEFUL_LISTEN_TIMEOUT : parseInt(process.env.PM2_GRACEFUL_LISTEN_TIMEOUT) || 3000,
+
+  DEFAULT_MODULE_JSON     : 'package.json',
+
   // Concurrent actions when doing start/restart/reload
   CONCURRENT_ACTIONS      : (function() {
     var concurrent_actions = parseInt(process.env.PM2_CONCURRENT_ACTIONS) || 1;

diff --git a/lib/API.js b/lib/API.js
@@ -17,7 +17,7 @@ var fclone      = require('fclone');
 var conf         = require('../constants.js');
 var Client      = require('./Client');
 var Common      = require('./Common');
-var KMDaemon    = require('./Interactor/InteractorDaemonizer');
+var KMDaemon    = require('./Interactor/InteractorClient');
 var Config      = require('./tools/Config');
 var Modularizer = require('./API/Modules/Modularizer.js');
 var path_structure = require('../paths.js');

diff --git a/lib/API/Configuration.js b/lib/API/Configuration.js
@@ -7,7 +7,7 @@ var chalk                = require('chalk');
 var async                = require('async');
 var Configuration        = require('../Configuration.js');
 //@todo double check that imported methods works
-var InteractorDaemonizer = require('../Interactor/InteractorDaemonizer');
+var InteractorClient = require('../Interactor/InteractorClient');
 
 module.exports = function(CLI) {
 
@@ -65,15 +65,15 @@ module.exports = function(CLI) {
       Configuration.set(key, value, function(err) {
         if (err)
           return cb ? cb(Common.retErr(err)) : that.exitCli(cst.ERROR_EXIT);
-        InteractorDaemonizer.launchRPC(that._conf, function(err) {
+        InteractorClient.launchRPC(that._conf, function(err) {
           if (err) {
             displayConf('pm2', function() {
               return cb ? cb(null, {success:true}) : that.exitCli(cst.SUCCESS_EXIT);
             });
             return false;
           }
-          InteractorDaemonizer.rpc.passwordSet(function() {
-            InteractorDaemonizer.disconnectRPC(function() {
+          InteractorClient.rpc.passwordSet(function() {
+            InteractorClient.disconnectRPC(function() {
               displayConf('pm2', function() {
                 return cb ? cb(null, {success:true}) : that.exitCli(cst.SUCCESS_EXIT);
               });

diff --git a/lib/API/Interaction.js b/lib/API/Interaction.js
@@ -6,7 +6,7 @@ var chalk       = require('chalk');
 var async       = require('async');
 var path        = require('path');
 var fs          = require('fs');
-var KMDaemon    = require('../Interactor/InteractorDaemonizer');
+var KMDaemon    = require('../Interactor/InteractorClient');
 
 module.exports = function(CLI) {
 

diff --git a/lib/Client.js b/lib/Client.js
@@ -6,7 +6,7 @@
 
 var debug          = require('debug')('pm2:client');
 var Common         = require('./Common.js');
-var KMDaemon       = require('./Interactor/InteractorDaemonizer.js');
+var KMDaemon       = require('./Interactor/InteractorClient.js');
 var rpc            = require('pm2-axon-rpc');
 var async          = require('async');
 var axon           = require('pm2-axon');

diff --git a/lib/Common.js b/lib/Common.js
@@ -19,7 +19,7 @@ var isBinary  = require('./tools/isbinaryfile.js');
 var cst       = require('../constants.js');
 var extItps   = require('./API/interpreter.json');
 var Config    = require('./tools/Config');
-var KMDaemon  = require('./Interactor/InteractorDaemonizer.js');
+var KMDaemon  = require('./Interactor/InteractorClient.js');
 
 /**
  * Common methods (used by CLI and God)

diff --git a/lib/Interactor/Cipher.js b/lib/Interactor/Cipher.js