From f24458bdb8bd29e8b25768325b8929643ba28b69 Mon Sep 17 00:00:00 2001
From: Adhidarma Hadiwinoto <me@adhisimon.org>
Date: Wed, 4 Dec 2019 14:32:47 +0700
Subject: [PATCH] Queues and providers gona test
---
bin/smstools-config-install | 2 +-
lib/smstools-config/creator.js | 16 +++++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/bin/smstools-config-install b/bin/smstools-config-install
index afca8bb..d9b5c75 100755
--- a/bin/smstools-config-install
+++ b/bin/smstools-config-install
@@ -11,4 +11,4 @@ if [ -z "$TARGETFILE" ]; then
fi
sudo install smsd.conf.tmp "$TARGETFILE"
-sudo systemctl restart sms3
+# sudo systemctl restart sms3
diff --git a/lib/smstools-config/creator.js b/lib/smstools-config/creator.js
index e57a68e..e35acb7 100644
--- a/lib/smstools-config/creator.js
+++ b/lib/smstools-config/creator.js
@@ -2,6 +2,7 @@ const moment = require('moment');
const config = require('komodo-sdk/config');
const { orderBy } = require('natural-orderby');
const smstoolsConfig = require('./config-file');
+const queuesAndProviders = require('./queues-and-providers');
function modemNames() {
const modems = [];
@@ -21,10 +22,19 @@ function modemEntries() {
modems.forEach((modemName) => {
const modem = smstoolsConfig.modems[modemName];
+ let queuesLine = '';
+ if (queuesAndProviders.hasQueues()) {
+ const queues = queuesAndProviders.getModemQueueName(modemName);
+ if (queues && queues.length) {
+ queuesLine = `queues = ${queues.join(', ')}`;
+ }
+ }
+
const modemEntry = `
[${modemName}]
device = ${modem.device}
outgoing = ${modem.outgoing ? 'yes' : 'no'}
+${queuesLine}
`.trim();
retval.push(modemEntry);
@@ -33,7 +43,9 @@ outgoing = ${modem.outgoing ? 'yes' : 'no'}
return retval;
}
-module.exports = () => {
+module.exports = async () => {
+ const queuesAndProvidersStr = queuesAndProviders.hasQueues() ? (await queuesAndProviders.dump()) : '';
+
const newContent = `
# Generated by komodo-center-smstools based on config timestamp ${moment(smstoolsConfig.ts).format('YYYY-MM-DD HH:mm:ss')}
# Do not edit this file manually
@@ -55,6 +67,8 @@ sent = /var/spool/sms/sent
failed = /var/spool/sms/failed
${smstoolsConfig.customConfig || ''}
+${queuesAndProvidersStr}
+
[default]
sentsleeptime = ${config.smstools_sentsleeptime || 0}
send_delay = ${config.smstools_send_delay || 0}
--
1.9.0