From 86b7163aa11f8bf3827d07df52b692b9e4b30d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= <oehrstroem@gmail.com>
Date: Sat, 5 Feb 2022 18:11:34 +0100
Subject: [PATCH] Update CHANGES

---
 CHANGES                                |  8 ++++
 README.md                              | 13 ++++--
 src/config.cc                          | 12 +++--
 test.sh                                |  3 ++
 tests/config10/wmbusmeters.conf        |  5 ++
 tests/config10/wmbusmeters.d/ApWater   |  4 ++
 tests/config10/wmbusmeters.d/Vatten    |  4 ++
 tests/config10/wmbusmeters.d/Wasser    |  4 ++
 tests/test_config_oneshot_exitafter.sh | 63 ++++++++++++++++++++++++++
 9 files changed, 109 insertions(+), 7 deletions(-)
 create mode 100644 tests/config10/wmbusmeters.conf
 create mode 100644 tests/config10/wmbusmeters.d/ApWater
 create mode 100644 tests/config10/wmbusmeters.d/Vatten
 create mode 100644 tests/config10/wmbusmeters.d/Wasser
 create mode 100755 tests/test_config_oneshot_exitafter.sh

diff --git a/CHANGES b/CHANGES
index 6aee7de..39e53c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,12 @@
 
+You can now combine --useconfig=<dir> with --oneshot --exitafter=<time>
+--silent --verbose --debug --normal --trace to override the config file settings.
+(Already existing possible overrides was --device=<device> and --listento<mode>.)
+
+This can be useful if you maintain a large set of meter configurations but want
+to start wmbusmeters from a cronjob regularly. You can also add oneshot=true
+and/or exitafter=30m to the conf file to get the same result.
+
 Krzysztof Lewandowski added support for multiple tariffs in the amiplus driver. Thanks Krzysztof!
 
 Bibo added support for the itron water meter. Thanks Bibo!
diff --git a/README.md b/README.md
index d8ba46e..1ba56fb 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,9 @@ You can trigger a reload of the config files with `sudo killall -HUP wmbusmeters
 (Note! make install only works for GNU/Linux. For MacOSX try to start
 `wmbusmetersd /tmp/thepidfile` from a script instead.)
 
+You can also start the daemon with another set of config files:
+`wmbusmetersd --useconfig=/home/wmbusmeters /tmp/thepidfile`
+
 Check the config file /etc/wmbusmeters.conf and edit the device. For example:
 `auto:c1` or `im871a:c1,t1` or `im871a[457200101056]:t1` or `/dev/ttyUSB2:amb8465:c1,t1`
 
@@ -155,7 +158,7 @@ If you cannot install as a daemon, then you can also start
 wmbusmeters in your terminal using the config files in `/etc/wmbusmeters`.
 
 ```shell
-wmbusmeters --useconfig=/
+wmbusmeters --useconfig=/etc
 ```
 
 Or you can start wmbusmeters with your own config files:
@@ -176,8 +179,12 @@ wmbusmeters --useconfig=/home/me/.config/wmbusmeters --device=rtlwmbus
 You must have both `--useconfig=` and `--device=` for it to work.
 
 The files/dir should then be located here:
-`/home/me/.config/wmbusmeters/etc/wmbusmeters.conf` and
-`/home/me/.config/wmbusmeters/etc/wmbusmeters.d`
+`/home/me/.config/wmbusmeters/wmbusmeters.conf` and
+`/home/me/.config/wmbusmeters/wmbusmeters.d`
+
+(For historical reasons wmbusmeters first looks for `/home/me/.config/wmbusmeters/wmbusmeters.conf`.)
+
+The option `--useconfig=` can only be combined with a few other options: `--device= --listento= --exitafter= --oneshot= --silent --normal --verbose --debug --trace`
 
 When running using config files then you can trigger a reload of the config files
 using `sudo killall -HUP wmbusmetersd` or `killall -HUP wmbusmeters`
diff --git a/src/config.cc b/src/config.cc
index f00bdc6..452058f 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -399,9 +399,13 @@ void handleExitAfter(Configuration *c, string after)
     }
 }
 
-void handleOneshot(Configuration *c)
+void handleOneshot(Configuration *c, string oneshot)
 {
-    c->oneshot = true;
+    if (oneshot == "true") { c->oneshot = true; }
+    else if (oneshot == "false") { c->oneshot = false;}
+    else {
+        warning("No such oneshot setting: \"%s\"\n", oneshot.c_str());
+    }
 }
 
 void handleLogtelegrams(Configuration *c, string logtelegrams)
@@ -672,7 +676,7 @@ shared_ptr<Configuration> loadConfiguration(string root, ConfigOverrides overrid
         else if (p.first == "donotprobe") handleDoNotProbe(c, p.second);
         else if (p.first == "listento") handleListenTo(c, p.second);
         else if (p.first == "exitafter") handleExitAfter(c, p.second);
-        else if (p.first == "oneshot") handleOneshot(c);
+        else if (p.first == "oneshot") handleOneshot(c, p.second);
         else if (p.first == "logtelegrams") handleLogtelegrams(c, p.second);
         else if (p.first == "meterfiles") handleMeterfiles(c, p.second);
         else if (p.first == "meterfilesaction") handleMeterfilesAction(c, p.second);
@@ -746,7 +750,7 @@ shared_ptr<Configuration> loadConfiguration(string root, ConfigOverrides overrid
     if (overrides.oneshot_override != "")
     {
         debug("(config) overriding oneshot with true\n");
-        handleOneshot(c);
+        handleOneshot(c, "true");
     }
 
     if (overrides.loglevel_override != "")
diff --git a/test.sh b/test.sh
index 3f096c3..a9cde1a 100755
--- a/test.sh
+++ b/test.sh
@@ -158,6 +158,9 @@ echo Slower tests...
 tests/test_pipe.sh $PROG
 if [ "$?" != "0" ]; then RC="1"; fi
 
+tests/test_config_oneshot_exitafter.sh $PROG
+if [ "$?" != "0" ]; then RC="1"; fi
+
 tests/test_config_overrides.sh $PROG
 if [ "$?" != "0" ]; then RC="1"; fi
 
diff --git a/tests/config10/wmbusmeters.conf b/tests/config10/wmbusmeters.conf
new file mode 100644
index 0000000..334fb11
--- /dev/null
+++ b/tests/config10/wmbusmeters.conf
@@ -0,0 +1,5 @@
+loglevel=verbose
+device=stdin:rtlwmbus
+format=json
+oneshot=true
+exitafter=2
diff --git a/tests/config10/wmbusmeters.d/ApWater b/tests/config10/wmbusmeters.d/ApWater
new file mode 100644
index 0000000..349572a
--- /dev/null
+++ b/tests/config10/wmbusmeters.d/ApWater
@@ -0,0 +1,4 @@
+name=ApWater
+driver=apator162
+id=88888888
+key=00000000000000000000000000000000
diff --git a/tests/config10/wmbusmeters.d/Vatten b/tests/config10/wmbusmeters.d/Vatten
new file mode 100644
index 0000000..99ad911
--- /dev/null
+++ b/tests/config10/wmbusmeters.d/Vatten
@@ -0,0 +1,4 @@
+name=Vatten
+driver=multical21
+id=76348799
+key=28F64A24988064A079AA2C807D6102AE
diff --git a/tests/config10/wmbusmeters.d/Wasser b/tests/config10/wmbusmeters.d/Wasser
new file mode 100644
index 0000000..f18f108
--- /dev/null
+++ b/tests/config10/wmbusmeters.d/Wasser
@@ -0,0 +1,4 @@
+name=Wasser
+driver=supercom587
+id=77777777
+key=5065747220486F6C79737A6577736B69
\ No newline at end of file
diff --git a/tests/test_config_oneshot_exitafter.sh b/tests/test_config_oneshot_exitafter.sh
new file mode 100755
index 0000000..c56e8d6
--- /dev/null
+++ b/tests/test_config_oneshot_exitafter.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+PROG="$1"
+
+if [ "$PROG" = "" ]
+then
+    echo Please supply the binary to be tested as the first argument.
+    exit 1
+fi
+
+TEST=testoutput
+
+rm -rf $TEST
+mkdir -p $TEST
+
+TESTNAME="Test config with oneshot"
+TESTRESULT="ERROR"
+
+cat simulations/serial_aes.msg | grep '^{' | tr -d '#' > $TEST/test_expected.txt
+cat simulations/serial_aes.msg | grep '^[CT]' | tr -d '#' > $TEST/test_input.txt
+
+cat $TEST/test_input.txt | $PROG --useconfig=tests/config10 > $TEST/test_output.txt 2> $TEST/test_stderr.txt
+
+if ! grep -q "(main) all meters have received at least one update, stopping." $TEST/test_stderr.txt
+then
+    echo "ERROR: $TESTNAME ($0)"
+    echo "Expected stderr to print \"all meters have received at least one update\""
+    exit 1
+fi
+
+cat $TEST/test_output.txt | sed 's/"timestamp":"....-..-..T..:..:..Z"/"timestamp":"1111-11-11T11:11:11Z"/' > $TEST/test_response.txt
+diff $TEST/test_expected.txt $TEST/test_response.txt
+if [ "$?" = "0" ]
+then
+    echo "OK: $TESTNAME"
+    TESTRESULT="OK"
+else
+    echo "ERROR: $TESTNAME"
+    exit 1
+fi
+
+TESTNAME="Test config with exitafter"
+TESTRESULT="ERROR"
+
+# Read from stdin
+
+{ echo "Nada" ; sleep 4; } | $PROG --useconfig=tests/config10 > $TEST/test_output.txt 2> $TEST/test_stderr.txt
+
+if ! grep -q "(serial) exit after " $TEST/test_stderr.txt
+then
+    echo "ERROR: $TESTNAME ($0)"
+    echo "Expected stderr to print \"(serial) exit after\""
+    exit 1
+else
+    echo "OK: $TESTNAME"
+    TESTRESULT=OK
+fi
+
+if [ "$TESTRESULT" = "ERROR" ]
+then
+    echo "ERROR: $TESTNAME ($0)"
+    exit 1
+fi