Friday...

KevLehman · KevLehman · commit 13044f7bc236 · 2021-10-15T13:45:26.000-06:00
diff --git a/app/livechat/server/index.js b/app/livechat/server/index.js
@@ -1,9 +1,9 @@
 import './livechat';
+import './config';
 import './startup';
 import './visitorStatus';
 import './agentStatus';
 import '../lib/messageTypes';
-import './config';
 import './roomType';
 import './hooks/beforeCloseRoom';
 import './hooks/beforeDelegateAgent';
diff --git a/app/livechat/server/lib/RoutingManager.js b/app/livechat/server/lib/RoutingManager.js
@@ -27,7 +27,13 @@ export const RoutingManager = {
 		// queue shouldn't start on CE
 	},
 
+	isMethodSet() {
+		return !!this.methodName;
+	},
+
 	setMethodName(name) {
+		const err = new Error();
+		console.log(err.stack);
 		this.logger.debug(`Changing default routing method from ${ this.methodName } to ${ name }`);
 		if (!this.methods[name]) {
 			this.logger.warn(`Cannot change routing method to ${ name }. Selected Routing method does not exists. Defaulting to Manual_Selection`);
diff --git a/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js b/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js
@@ -259,8 +259,10 @@ const queueWorker = {
 	},
 };
 
+let omnichannelIsEnabled = false;
+
 function shouldQueueStart() {
-	if (!settings.get('Livechat_enabled')) {
+	if (!omnichannelIsEnabled) {
 		queueWorker.stop();
 		return;
 	}
@@ -276,3 +278,8 @@ function shouldQueueStart() {
 }
 
 RoutingManager.startQueue = shouldQueueStart;
+
+settings.get('Livechat_enabled', (_, value) => {
+	omnichannelIsEnabled = value;
+	omnichannelIsEnabled && RoutingManager.isMethodSet() ? shouldQueueStart(value) : queueWorker.stop();
+});
