From c7fc786aa32339fe0132cc89e916a3850bbc9159 Mon Sep 17 00:00:00 2001
From: "jakob.stendahl" <jakob.stendahl@infomedia.dk>
Date: Wed, 17 Apr 2024 13:34:25 +0200
Subject: things

---
 bin/pingme.m4 |  3 +++
 bin/sqlwait   | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'bin')

diff --git a/bin/pingme.m4 b/bin/pingme.m4
index 5eea292..1bb2feb 100644
--- a/bin/pingme.m4
+++ b/bin/pingme.m4
@@ -13,3 +13,6 @@ tmux display-message "${MESSAGE}"
 m4_ifelse(DT_GOTIFY_URL, `', `', `m4_dnl
 GOTIFY_RES=$(curl "$GOTIFY_URL" -F "title=Pingme" -F "message=$MESSAGE" -F "priority=5" 2> /dev/null)
 ')m4_dnl
+m4_ifelse(DT_DOTFILES_TYPE, `local', `m4_dnl
+notify-send "$MESSAGE"
+')m4_dnl
diff --git a/bin/sqlwait b/bin/sqlwait
index 6d472a9..5e7398c 100755
--- a/bin/sqlwait
+++ b/bin/sqlwait
@@ -1,6 +1,6 @@
 #!/bin/sh
-set -e
 
+SLEEP=10
 PRINT_FLAG=false
 MYSQL_HOST="localhost"
 COMPARE_TYPE="eq"
@@ -76,11 +76,17 @@ if [ -z "$MYSQL_DATABASE" ]; then
   exit 1
 fi
 
-read -s -p "Enter password: " MYSQL_PASSWORD
+read -s -p "Enter password: " MYSQL_PWD
 echo
+export MYSQL_PWD
 
 while true; do
-    RESULT=$(mysql -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" -h"$MYSQL_HOST" "$MYSQL_DATABASE" -e "$QUERY" --batch --silent 2> /dev/null)
+    RESULT=$(mysql -u"$MYSQL_USER"  -h"$MYSQL_HOST" "$MYSQL_DATABASE" -e "$QUERY" --batch --silent)
+    if [ ! "$?" = "0" ]; then
+        >&2 echo "[$(date)]: MySQL Error!"
+        sleep $SLEEP
+        continue
+    fi
     if [ "$PRINT_FLAG" = true ]; then
         echo "[$(date)]: ${RESULT}"
     fi
@@ -108,6 +114,8 @@ while true; do
         fi
     fi
 
-    sleep 10
+    sleep $SLEEP
 done
 
+unset MYSQL_PWD
+
-- 
cgit v1.2.3