Change amqp dependency and client logic (#922)

* Change amqp dependency and client logic

Author: starwarfan

source/agent/analytics/dist.json

@@ -16,7 +16,7 @@
             "../nodeManager.js",
             "../workingNode.js",
             "../../common/cipher.js",
-            "../../common/amqp_client.js",
+            "../../common/amqpClient.js",
             "../../common/cipher.js",
             "../../common/clusterWorker.js",
             "../../common/loadCollector.js",

source/agent/analytics/package.json

@@ -2,7 +2,7 @@
   "name": "OWT-Server-Agent",
   "version":"5.0.0",
   "dependencies": {
-    "amqp": "*",
+    "amqplib": "^0.7.0",
     "log4js": "^1.1.1",
     "node-getopt": "*",
     "toml": "*"

source/agent/audio/dist.json

@@ -15,7 +15,7 @@
             "../workingNode.js",
             "log4cxx.properties",
             "../../common/cipher.js",
-            "../../common/amqp_client.js",
+            "../../common/amqpClient.js",
             "../../common/clusterWorker.js",
             "../../common/loadCollector.js",
             "../../common/logger.js",

source/agent/conference/conference.js

@@ -509,7 +509,7 @@ var Conference = function (rpcClient, selfRpcId) {
     return Promise.all(pl)
       .then(() => {
         doClean();
-        process.exit();
+        process.kill(process.pid, 'SIGINT');
       });
   };
 

source/agent/conference/dist.json

@@ -22,7 +22,7 @@
             "../networkHelper.js",
             "../../common/formatUtil.js",
             "../../common/cipher.js",
-            "../../common/amqp_client.js",
+            "../../common/amqpClient.js",
             "../../common/clusterWorker.js",
             "../../common/loadCollector.js",
             "../../common/logger.js",

source/agent/conference/package.json

@@ -2,7 +2,7 @@
   "name": "OWT-Server-Conference-Controller",
   "version":"5.0.0",
   "dependencies": {
-    "amqp": "*",
+    "amqplib": "^0.7.0",
     "log4js": "^1.1.1",
     "node-getopt": "*",
     "toml": "*",

source/agent/index.js

@@ -52,7 +52,7 @@ for (var prop in opt.options) {
 
 var clusterWorker = require('./clusterWorker');
 var nodeManager = require('./nodeManager');
-var amqper = require('./amqp_client')();
+var amqper = require('./amqpClient')();
 var rpcClient;
 var monitoringTarget;
 
@@ -221,16 +221,21 @@ amqper.connect(config.rabbit, function () {
 });
 
 ['SIGINT', 'SIGTERM'].map(function (sig) {
-    process.on(sig, function () {
+    process.on(sig, async function () {
         log.warn('Exiting on', sig);
+        manager && manager.dropAllNodes(true);
+        worker && worker.quit();
+        try {
+            await amqper.disconnect();
+        } catch(e) {
+            log.warn('Exiting e:', e);
+        }
         process.exit();
     });
 });
 
 process.on('exit', function () {
-    manager && manager.dropAllNodes(true);
-    worker && worker.quit();
-    amqper.disconnect();
+    log.info('Process exit');
 });
 
 process.on('unhandledRejection', (reason) => {

source/agent/nodeManager.js

@@ -309,6 +309,7 @@ module.exports = function (spec, spawnOptions, onNodeAbnormallyQuit, onTaskAdded
   };
 
   that.dropAllNodes = function(quietly) {
+      spawn_failed = true;
       Object.keys(processes).map(function (k) {
           !quietly && onNodeAbnormallyQuit && onNodeAbnormallyQuit(k, tasksOnNode(k));
           dropNode(k);

source/agent/package.json

@@ -2,7 +2,7 @@
   "name": "OWT-Server-Agent",
   "version":"5.0.0",
   "dependencies": {
-    "amqp": "*",
+    "amqplib": "^0.7.0",
     "log4js": "^1.1.1",
     "node-getopt": "*",
     "toml": "*"

source/agent/quic/dist.json

@@ -13,7 +13,7 @@
           "../workingNode.js",
           "../InternalConnectionFactory.js",
           "log4cxx.properties",
-          "../../common/amqp_client.js",
+          "../../common/amqpClient.js",
           "../../common/cipher.js",
           "../../common/clusterWorker.js",
           "../../common/loadCollector.js",