@tiledesk/tiledesk-server 2.9.14 → 2.9.15

package/CHANGELOG.md

@@ -5,6 +5,9 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.15
+- Updated jobs-worker-queue-manager
+
 # 2.9.14
 - Added replace option in chatbot import json
 - Added field project_user, fullname, email and assigned requests to what /users/availables returns 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.9.14",
+  "version": "2.9.15",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/routes/kb.js

@@ -28,8 +28,12 @@ let jobManager = new JobManager(AMQP_MANAGER_URL, {
   exchange: JOB_TOPIC_EXCHANGE
 })
 
-jobManager.connectAndStartPublisher(() => {
-  winston.info("ConnectPublisher done");
+jobManager.connectAndStartPublisher((status, error) => {
+  if (error) {
+    winston.error("connectAndStartPublisher error: ", error);
+  } else {
+    winston.info("KbRoute - ConnectPublisher done with status: ", status);
+  }
 })
 
 let default_preview_settings = {

package/utils/jobs-worker-queue-manager/JobManagerV2.js

@@ -21,7 +21,15 @@ class JobManager {
         var that = this;
         if (this.info) {console.log("[JobWorker] JobManager publisher started");}
         
-        this.queueManager.connect(function() {
+        this.queueManager.connect(function(status, err) {
+
+            if (err) {
+                console.log("[JobWorker] - connectAndStartPublisher - connection error: ", err);
+                if (callback) {
+                    callback(null, err)
+                    return;
+                }
+            }
             if (that.debug) {console.log("[JobWorker] Queue started");}
             that.queuePublisherConnected = true;
 
@@ -41,7 +49,8 @@ class JobManager {
                 } 
 
                 if (callback) {
-                    callback();
+                    callback(status, null);
+                    return;
                 }
             });
         });

package/utils/jobs-worker-queue-manager/queueManagerClassV2.js

@@ -46,29 +46,37 @@ connect(callback) {
     amqp.connect(this.url, function(err, conn) {
       if (err) {
         // if (this.debug) {console.log("[AMQP]", err.message);
-        if (that.debug) {console.log("[JobWorker] AMQP", err);}
+        // if (that.debug) {console.log("[JobWorker] AMQP", err);}
+        console.error("[JobWorker] AMQP", err);
+        console.log("[JobWorker] Try to reconnect");
 
         return setTimeout(function() {
           that.connect()
         }, 1000);
       }
       conn.on("error", function(err) {
+        console.error("[JobWorker] err.message", err.message);
         if (err.message !== "Connection closing") {
-          if (that.debug) {console.log("[JobWorker] AMQP conn error", err);}
+          //if (that.debug) {console.log("[JobWorker] AMQP conn error", err);}
+          console.log("[JobWorker] AMQP conn error", err)
+          if (callback) {
+            callback(null, err)
+          }
         }
       });
       conn.on("close", function() {
-        if (that.debug) {console.log("[JobWorker] AMQP reconnecting");}
+        // if (that.debug) {console.log("[JobWorker] AMQP reconnecting");}
+        console.log("[JobWorker] AMQP reconnecting")
         return setTimeout(that.connect, 1000);
       });
 
-      if (that.debug) {console.log("[JobWorker] AMQP connected");}
+      console.log("[JobWorker] AMQP connected")
       that.amqpConn = conn;
 
       // that.whenConnected(callback);
 
       if (callback) {
-        callback();
+        callback('Connected', null);
       }
     //   return resolve();
     // });
@@ -96,10 +104,12 @@ startPublisher(callback) {
   that.amqpConn.createConfirmChannel(function(err, ch) {
     if (that.closeOnErr(err)) return;
     ch.on("error", function(err) {
-      if (that.debug) {console.log("[JobWorker] AMQP channel error", err);}
+      // if (that.debug) {console.log("[JobWorker] - startPublisher AMQP channel error", err);}
+      console.log("[JobWorker] - startPublisher AMQP channel error", err);
     });
     ch.on("close", function() {
-      if (that.debug) {console.log("[JobWorker] AMQP channel closed");}
+      // if (that.debug) {console.log("[JobWorker] AMQP channel closed");}
+      console.log("[JobWorker] - startPublisher AMQP channel closed")
     });
 
     // if (this.debug) {console.log("[AMQP] pubChannel");