From: git <redacted>
Date: Sun, 3 May 2026 19:09:28 +0000 (-0400)
Subject: improve error handling across every script
X-Git-Url: https://git.datadissipation.net/?a=commitdiff_plain;h=f26e964fc7f132f74e069879f94ad5ad347da4ce;p=logtools.git

improve error handling across every script
---

diff --git a/chckip b/chckip
index c2d8afe..e4d409d 100755
--- a/chckip
+++ b/chckip
@@ -1,5 +1,15 @@
 #!/bin/sh
 
-SERVER=$(which > /dev/null apache2 && printf "apache2" || which > /dev/null nginx && printf "nginx" || printf "ERROR: server not detected, needs to be set manually")
+trap "exit 2" USR1
+
+err() {
+        printf "error: server not detected, needs to be set manually\n" >&2
+        printf "set \$SERVER or modify the script itself\n" >&2
+        kill -USR1 "$$"
+}
+
+# ... && ... || is not an if-then-else, but this works because
+# there's no way for only one printf to fail
+[ -z "$SERVER" ] && SERVER=$(which > /dev/null 2>&1 apache2 && printf "apache2" || which > /dev/null 2>&1 nginx && printf "nginx" || err)
 
 { zcat /var/log/"$SERVER"/access.log.*.gz; cat /var/log/"$SERVER"/access.log /var/log/"$SERVER"/access.log.1; } | grep -a "$@" | awk '{print $1}' | sort | uniq | xargs -L 1 host
diff --git a/countconn b/countconn
index 0652279..0d71501 100755
--- a/countconn
+++ b/countconn
@@ -1,6 +1,16 @@
 #!/bin/sh
 
-SERVER=$(which > /dev/null apache2 && printf "apache2" || which > /dev/null nginx && printf "nginx" || printf "ERROR: server not detected, needs to be set manually")
+trap "exit 2" USR1
+
+err() {
+        printf "error: server not detected, needs to be set manually\n" >&2
+        printf "set \$SERVER or modify the script itself\n" >&2
+        kill -USR1 "$$"
+}
+
+# ... && ... || is not an if-then-else, but this works because
+# there's no way for only one printf to fail
+[ -z "$SERVER" ] && SERVER=$(which > /dev/null 2>&1 apache2 && printf "apache2" || which > /dev/null 2>&1 nginx && printf "nginx" || err)
 
 [ "$1" -eq "$1" ] 2>/dev/null && NUM="$1" || NUM=30
 
diff --git a/esearchlog b/esearchlog
index 044f1b7..5d2fe27 100755
--- a/esearchlog
+++ b/esearchlog
@@ -1,5 +1,15 @@
 #!/bin/sh
 
-SERVER=$(which > /dev/null apache2 && printf "apache2" || which > /dev/null nginx && printf "nginx" || printf "ERROR: server not detected, needs to be set manually")
+trap "exit 2" USR1
+
+err() {
+        printf "error: server not detected, needs to be set manually\n" >&2
+        printf "set \$SERVER or modify the script itself\n" >&2
+        kill -USR1 "$$"
+}
+
+# ... && ... || is not an if-then-else, but this works because
+# there's no way for only one printf to fail
+[ -z "$SERVER" ] && SERVER=$(which > /dev/null 2>&1 apache2 && printf "apache2" || which > /dev/null 2>&1 nginx && printf "nginx" || err)
 
 { zcat /var/log/"$SERVER"/error.log.*.gz; cat /var/log/"$SERVER"/error.log /var/log/"$SERVER"/error.log.1; } | grep --color=auto -a "$@"
diff --git a/searchlog b/searchlog
index 9d16e63..a6bd11d 100755
--- a/searchlog
+++ b/searchlog
@@ -1,5 +1,15 @@
 #!/bin/sh
 
-SERVER=$(which > /dev/null apache2 && printf "apache2" || which > /dev/null nginx && printf "nginx" || printf "ERROR: server not detected, needs to be set manually")
+trap "exit 2" USR1
+
+err() {
+        printf "error: server not detected, needs to be set manually\n" >&2
+        printf "set \$SERVER or modify the script itself\n" >&2
+        kill -USR1 "$$"
+}
+
+# ... && ... || is not an if-then-else, but this works because
+# there's no way for only one printf to fail
+[ -z "$SERVER" ] && SERVER=$(which > /dev/null 2>&1 apache2 && printf "apache2" || which > /dev/null 2>&1 nginx && printf "nginx" || err)
 
 { zcat /var/log/"$SERVER"/access.log.*.gz; cat /var/log/"$SERVER"/access.log /var/log/"$SERVER"/access.log.1; } | grep --color=auto -a "$@"