From 363946c9a55572be245339b4495f0a15fd9dea66 Mon Sep 17 00:00:00 2001
From: Dominika Liberda <ja@sdomi.pl>
Date: Sat, 12 Jun 2021 11:12:08 +0000
Subject: [PATCH] * moved checkers back to individual workers

---
 code/func.sh                            |  4 ++--
 config.sh                               |  5 ++++-
 workers/checker/worker.sh               | 30 -------------------------
 workers/{checker => every_1min}/control |  0
 workers/every_1min/worker.sh            |  5 +++++
 workers/every_30min/control             |  0
 workers/every_30min/worker.sh           |  5 +++++
 workers/every_5min/control              |  0
 workers/every_5min/worker.sh            |  5 +++++
 workers/notify/control                  |  0
 workers/notify/worker.sh                |  3 +++
 11 files changed, 24 insertions(+), 33 deletions(-)
 delete mode 100755 workers/checker/worker.sh
 rename workers/{checker => every_1min}/control (100%)
 create mode 100755 workers/every_1min/worker.sh
 create mode 100644 workers/every_30min/control
 create mode 100755 workers/every_30min/worker.sh
 create mode 100644 workers/every_5min/control
 create mode 100755 workers/every_5min/worker.sh
 create mode 100644 workers/notify/control
 create mode 100755 workers/notify/worker.sh

diff --git a/code/func.sh b/code/func.sh
index 73ad456..273f5ed 100644
--- a/code/func.sh
+++ b/code/func.sh
@@ -51,10 +51,10 @@ function notify() {
 					msg="$label is DOWN"
 				elif [[ "$2" == "0" ]]; then
 					msg="$label is back UP"
-				fi
+				fi				
 				curl -X POST -H 'Content-Type: application/json'\
 				-d '{"chat_id": "'"$k"'", "text": "'"$msg"'", "disable_notification": false}'\
-				"https://api.telegram.org/bot${cfg[telegram_bot_token]}/sendMessage" > /dev/null
+				"https://api.telegram.org/bot${cfg[telegram_bot_token]}/sendMessage" -vvv > /dev/stderr
 			done
 		else
 			echo "not supported (yet)"
diff --git a/config.sh b/config.sh
index 6da5b8d..9596a7a 100644
--- a/config.sh
+++ b/config.sh
@@ -3,4 +3,7 @@
 
 cfg[useragent]="dtr/1.0 (https://git.sakamoto.pl/domi/dtr)"
 
-worker_add checker 60
+worker_add every_1min 60
+worker_add every_5min 300
+worker_add every_30min 1800
+worker_add notify 60
diff --git a/workers/checker/worker.sh b/workers/checker/worker.sh
deleted file mode 100755
index a286fcb..0000000
--- a/workers/checker/worker.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-if [[ "$counter5" == '' ]]; then
-	counter5=5
-else
-	counter5=$((counter5+1))
-fi
-if [[ "$counter30" == '' ]]; then
-	counter30=30
-else
-	counter30=$((counter30+1))
-fi
-
-source "${cfg[namespace]}/code/ping.sh" every_1min
-source "${cfg[namespace]}/code/req.sh" every_1min
-source "${cfg[namespace]}/code/port.sh" every_1min
-
-if [[ $counter30 == 30 ]]; then
-	source "${cfg[namespace]}/code/ping.sh" every_30min
-	source "${cfg[namespace]}/code/req.sh" every_30min
-	source "${cfg[namespace]}/code/port.sh" every_30min
-	counter30=0
-fi
-if [[ $counter5 == 5 ]]; then
-	source "${cfg[namespace]}/code/ping.sh" every_5min
-	source "${cfg[namespace]}/code/req.sh" every_5min
-	source "${cfg[namespace]}/code/port.sh" every_5min
-	counter5=0
-fi
-
-source "${cfg[namespace]}/code/notify.sh"
diff --git a/workers/checker/control b/workers/every_1min/control
similarity index 100%
rename from workers/checker/control
rename to workers/every_1min/control
diff --git a/workers/every_1min/worker.sh b/workers/every_1min/worker.sh
new file mode 100755
index 0000000..dfd9223
--- /dev/null
+++ b/workers/every_1min/worker.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source "${cfg[namespace]}/code/ping.sh" every_1min
+source "${cfg[namespace]}/code/req.sh" every_1min
+source "${cfg[namespace]}/code/port.sh" every_1min
diff --git a/workers/every_30min/control b/workers/every_30min/control
new file mode 100644
index 0000000..e69de29
diff --git a/workers/every_30min/worker.sh b/workers/every_30min/worker.sh
new file mode 100755
index 0000000..1b44bdf
--- /dev/null
+++ b/workers/every_30min/worker.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source "${cfg[namespace]}/code/ping.sh" every_30min
+source "${cfg[namespace]}/code/req.sh" every_30min
+source "${cfg[namespace]}/code/port.sh" every_30min
diff --git a/workers/every_5min/control b/workers/every_5min/control
new file mode 100644
index 0000000..e69de29
diff --git a/workers/every_5min/worker.sh b/workers/every_5min/worker.sh
new file mode 100755
index 0000000..b737e56
--- /dev/null
+++ b/workers/every_5min/worker.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source "${cfg[namespace]}/code/ping.sh" every_5min
+source "${cfg[namespace]}/code/req.sh" every_5min
+source "${cfg[namespace]}/code/port.sh" every_5min
diff --git a/workers/notify/control b/workers/notify/control
new file mode 100644
index 0000000..e69de29
diff --git a/workers/notify/worker.sh b/workers/notify/worker.sh
new file mode 100755
index 0000000..8b1bca2
--- /dev/null
+++ b/workers/notify/worker.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+source "${cfg[namespace]}/code/notify.sh"