From b7088016113a41d1769282c720e5c6c3461e118b Mon Sep 17 00:00:00 2001
From: Adhidarma Hadiwinoto <me@adhisimon.org>
Date: Wed, 4 Dec 2019 14:20:36 +0700
Subject: [PATCH] Modem queue name is an array
---
lib/smstools-config/queues-and-providers.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/lib/smstools-config/queues-and-providers.js b/lib/smstools-config/queues-and-providers.js
index 6e7af61..495993a 100644
--- a/lib/smstools-config/queues-and-providers.js
+++ b/lib/smstools-config/queues-and-providers.js
@@ -91,7 +91,12 @@ exports.dump = async (mkdirIfQueueDirNotExists) => {
};
exports.getModemQueueName = (modemName) => {
- const queue = (smstoolsConfig.queues || [])
- .find((item) => (item.modems || []).indexOf(modemName) >= 0);
- return (queue || {}).name || '';
+ const queues = queuesSorted().filter((queue) => {
+ if (!queue.name || !queue.enabled) return false;
+ return (queue.modems || []).indexOf(modemName) >= 0;
+ });
+
+ return (queues || '').map((queue) => queue.name);
};
+
+exports.hasQueues = () => !!(smstoolsConfig.queues || []).filter((queue) => queue.enabled);
--
1.9.0