From 1300448bed9f7f05f5f8f6bc2862e2b0dbbc4d88 Mon Sep 17 00:00:00 2001
From: No0Vad <dexxaboy@gmail.com>
Date: Wed, 15 Sep 2021 00:59:06 +0200
Subject: [PATCH] Adjustments to the retry interval

The monitor logic for when to use "retryInterval" is updated. Also removed some texts when they are no longer needed.
---
 server/model/monitor.js   | 2 +-
 src/languages/en.js       | 2 --
 src/pages/EditMonitor.vue | 6 +-----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 876d0ca1..92ef9834 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -299,7 +299,7 @@ class Monitor extends BeanModel {
             if (bean.status === UP) {
                 console.info(`Monitor #${this.id} '${this.name}': Successful Response: ${bean.ping} ms | Interval: ${beatInterval} seconds | Type: ${this.type}`)
             } else if (bean.status === PENDING) {
-                if (this.retryInterval > 0) {
+                if (this.retryInterval !== this.interval) {
                     beatInterval = this.retryInterval;
                 }
                 console.warn(`Monitor #${this.id} '${this.name}': Pending: ${bean.msg} | Max retries: ${this.maxretries} | Retry: ${retries} | Retry Interval: ${beatInterval} seconds | Type: ${this.type}`)
diff --git a/src/languages/en.js b/src/languages/en.js
index 88c3dc1e..98a4010e 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -4,8 +4,6 @@ export default {
     retryCheckEverySecond: "Retry every {0} seconds.",
     "Avg.": "Avg.",
     retriesDescription: "Maximum retries before the service is marked as down and a notification is sent",
-    retryIntervalInactive: "Inactive",
-    retryIntervalDescription: "If retries are used and this value is greater then zero this interval will be used instead.",
     ignoreTLSError: "Ignore TLS/SSL error for HTTPS websites",
     upsideDownModeDescription: "Flip the status upside down. If the service is reachable, it is DOWN.",
     maxRedirectDescription: "Maximum number of redirects to follow. Set to 0 to disable redirects.",
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 73ab0479..04582628 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -109,13 +109,9 @@
                             <div class="my-3">
                                 <label for="retry-interval" class="form-label">
                                     {{ $t("Heartbeat Retry Interval") }}
-                                    <span v-if="monitor.retryInterval > 0">({{ $t("retryCheckEverySecond", [ monitor.retryInterval ]) }})</span>
-                                    <span v-else>({{ $t("retryIntervalInactive") }})</span>
+                                    <span>({{ $t("retryCheckEverySecond", [ monitor.retryInterval ]) }})</span>
                                 </label>
                                 <input id="retry-interval" v-model="monitor.retryInterval" type="number" class="form-control" required min="20" step="1">
-                                <div class="form-text">
-                                    {{ $t("retryIntervalDescription") }}
-                                </div>
                             </div>
 
                             <h2 class="mt-5 mb-2">{{ $t("Advanced") }}</h2>