From 1adc343ebd6cbcefe4b386109079033e72726d17 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 15 Feb 2021 23:01:07 +0000
Subject: [PATCH] Improve test for current broch mode

---
 blocking.py | 13 ++++++++-----
 daemon.py   |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/blocking.py b/blocking.py
index bf48bb1ad..9655e1c9d 100644
--- a/blocking.py
+++ b/blocking.py
@@ -415,28 +415,31 @@ def setBrochMode(baseDir: str, domainFull: str, enabled: bool) -> None:
     setConfigParam(baseDir, "brochMode", enabled)
 
 
-def brochModeLapses(baseDir: str, lapseDays=7) -> None:
+def brochModeLapses(baseDir: str, lapseDays=7) -> bool:
     """After broch mode is enabled it automatically
     elapses after a period of time
     """
     allowFilename = baseDir + '/accounts/allowedinstances.txt'
     if not os.path.isfile(allowFilename):
-        return
+        return False
     lastModified = fileLastModified(allowFilename)
     modifiedDate = None
+    brochMode = True
     try:
         modifiedDate = \
             datetime.strptime(lastModified, "%Y-%m-%dT%H:%M:%SZ")
     except BaseException:
-        return
+        return brochMode
     if not modifiedDate:
-        return
+        return brochMode
     currTime = datetime.datetime.utcnow()
     daysSinceBroch = (currTime - modifiedDate).days
     if daysSinceBroch >= lapseDays:
         try:
             os.remove(allowFilename)
-            setConfigParam(baseDir, "brochMode", False)
+            brochMode = False
+            setConfigParam(baseDir, "brochMode", brochMode)
             print('Broch mode has elapsed')
         except BaseException:
             pass
+    return brochMode
diff --git a/daemon.py b/daemon.py
index 9d3014250..7fb3b71cb 100644
--- a/daemon.py
+++ b/daemon.py
@@ -4548,7 +4548,9 @@ class PubServer(BaseHTTPRequestHandler):
                             if fields.get('brochMode'):
                                 if fields['brochMode'] == 'on':
                                     brochMode = True
-                            if brochMode != self.server.brochMode:
+                            currBrochMode = \
+                                getConfigParam(baseDir, "brochMode")
+                            if brochMode != currBrochMode:
                                 setBrochMode(self.server.baseDir,
                                              self.server.domainFull,
                                              brochMode)