From 0a78cc4ee88020199cc795126419f3cc33e64669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kolinger?= <tomas@kolinger.name>
Date: Fri, 12 Aug 2022 19:50:15 +0200
Subject: [PATCH] improved wording on error handling

---
 webapp/backend.py           | 2 +-
 webapp/templates/setup.html | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/webapp/backend.py b/webapp/backend.py
index d21abf5..0ddce9a 100644
--- a/webapp/backend.py
+++ b/webapp/backend.py
@@ -342,7 +342,7 @@ def retry(self, callback):
                     condition.append("until %s" % timestamp)
 
                 if len(condition):
-                    condition = " and ".join(condition)
+                    condition = " or ".join(condition)
                 else:
                     condition = "indefinitely"
 
diff --git a/webapp/templates/setup.html b/webapp/templates/setup.html
index e279423..2e15663 100644
--- a/webapp/templates/setup.html
+++ b/webapp/templates/setup.html
@@ -28,13 +28,17 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="control-label" for="retry_count">Retry on error (number of times)</label>
+            <label class="control-label" for="retry_count">Number of retries</label>
             <input type="number" class="form-control" id="retry_count" name="retry_count" value="{{ setup["retry_count"] }}" />
             <div class="help-block">
                 How many times to retry operation before giving up. Set to 0 to retry indefinitely.
                 Default: {{ default_retry_count }} times.
             </div>
         </div>
+        <div class="alert alert-info">
+            Note: Both timeout and number of retries work together.
+            If one run-outs before the other, the connection is terminated.
+        </div>
         <div class="form-group">
             <button type="submit" name="do" class="btn btn-default">
                 Save