@tiledesk/tiledesk-server 2.10.53 → 2.10.54
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
package/package.json
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
2
|
"name": "@tiledesk/tiledesk-server",
|
3
3
|
"description": "The Tiledesk server module",
|
4
|
-
"version": "2.10.
|
4
|
+
"version": "2.10.54",
|
5
5
|
"scripts": {
|
6
6
|
"start": "node ./bin/www",
|
7
7
|
"pretest": "mongodb-runner start",
|
@@ -53,7 +53,7 @@
|
|
53
53
|
"@tiledesk/tiledesk-sms-connector": "^0.1.11",
|
54
54
|
"@tiledesk/tiledesk-vxml-connector": "^0.1.67",
|
55
55
|
"@tiledesk/tiledesk-voice-twilio-connector": "^0.1.12",
|
56
|
-
"@tiledesk/tiledesk-multi-worker": "^0.1.
|
56
|
+
"@tiledesk/tiledesk-multi-worker": "^0.1.19",
|
57
57
|
"passport-oauth2": "^1.8.0",
|
58
58
|
"amqplib": "^0.5.5",
|
59
59
|
"app-root-path": "^3.0.0",
|
@@ -46,28 +46,24 @@ connect(callback) {
|
|
46
46
|
amqp.connect(this.url, function(err, conn) {
|
47
47
|
if (err) {
|
48
48
|
// if (this.debug) {console.log("[AMQP]", err.message);
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
return setTimeout(function() {
|
54
|
-
that.connect()
|
49
|
+
console.error("[JobWorker] AMQP error", err);
|
50
|
+
return setTimeout(function () {
|
51
|
+
if (that.debug) { console.log("[JobWorker] AMQP reconnecting"); }
|
52
|
+
that.connect(callback)
|
55
53
|
}, 1000);
|
54
|
+
|
56
55
|
}
|
57
56
|
conn.on("error", function(err) {
|
58
|
-
console.error("[JobWorker] err.message", err.message);
|
59
57
|
if (err.message !== "Connection closing") {
|
60
|
-
|
61
|
-
console.log("[JobWorker] AMQP conn error", err)
|
62
|
-
if (callback) {
|
63
|
-
callback(null, err)
|
64
|
-
}
|
58
|
+
console.log("[JobWorker] AMQP conn error", err);
|
65
59
|
}
|
66
60
|
});
|
67
61
|
conn.on("close", function() {
|
68
62
|
// if (that.debug) {console.log("[JobWorker] AMQP reconnecting");}
|
69
63
|
console.log("[JobWorker] AMQP reconnecting")
|
70
|
-
return setTimeout(
|
64
|
+
return setTimeout(() => {
|
65
|
+
that.connect(callback);
|
66
|
+
}, 1000);
|
71
67
|
});
|
72
68
|
|
73
69
|
console.log("[JobWorker] AMQP connected")
|
@@ -101,15 +97,13 @@ whenConnected(callback) {
|
|
101
97
|
|
102
98
|
startPublisher(callback) {
|
103
99
|
var that = this;
|
104
|
-
that.amqpConn.createConfirmChannel(function(err, ch) {
|
100
|
+
that.amqpConn.createConfirmChannel(function (err, ch) {
|
105
101
|
if (that.closeOnErr(err)) return;
|
106
|
-
ch.on("error", function(err) {
|
107
|
-
|
108
|
-
console.log("[JobWorker] - startPublisher AMQP channel error", err);
|
102
|
+
ch.on("error", function (err) {
|
103
|
+
if (that.debug) { console.log("[JobWorker] AMQP channel error", err); }
|
109
104
|
});
|
110
|
-
ch.on("close", function() {
|
111
|
-
|
112
|
-
console.log("[JobWorker] - startPublisher AMQP channel closed")
|
105
|
+
ch.on("close", function () {
|
106
|
+
if (that.debug) { console.log("[JobWorker] AMQP channel closed"); }
|
113
107
|
});
|
114
108
|
|
115
109
|
// if (this.debug) {console.log("[AMQP] pubChannel");
|
@@ -122,7 +116,7 @@ startPublisher(callback) {
|
|
122
116
|
// }
|
123
117
|
|
124
118
|
if (callback) {
|
125
|
-
|
119
|
+
callback(err);
|
126
120
|
}
|
127
121
|
|
128
122
|
});
|