Debug tunmgrd.

Author: lhunath

tunmgrd/tunmgrd

@@ -26,14 +26,11 @@ source bashlib                                                                #
 
 # Load and parse the tunnel configuration file.
 cd
-TMPDIR=${TMPDIR:-/tmp} TMPDIR=${TMPDIR%/}
-_logVerbosity=2 logDir= config=()
+config=()
 source "$HOME/.tunmgrd.conf"
 : ${logDir:=$TMPDIR}
-[[ -t 1 ]]
-: ${logColor:=$(( ! $? ))}
 _logFile=$logDir/tunmgrd.log
-_logColor=$logColor
+loopDelay=3
 for ((t=0; t < ${#config[@]}; ++t)); do
     read urls[t] modifiers[t] configs[t] <<< "${config[t]}"
 done
@@ -89,11 +86,12 @@ while true; do
         schema=${urls[t]%%://*}
         case "$schema" in
             ssh) port=${port:-22} ;;
-            http) port=${port:-80} ;;
-            https) port=${port:-443} ;;
+            http) host=${host%%/*} port=${port:-80} ;;
+            https) host=${host%%/*} port=${port:-443} ;;
         esac
 
         # Can we get a response over the connection? -> up
+        dbg 'Looking for activity for: %s (%s)' "${urls[t]}" "${out[t]}"
         if [[ ${out[t]} ]] && {
             read -d ''
             for tries in {1..3}; do
@@ -109,6 +107,7 @@ while true; do
         fi
 
         # No response received - Is the process alive? -> lag
+        dbg 'No activity, checking if controller(pid: %s, %s) is alive: %s' "${pid[t]}" "${state[t]}" "${urls[t]}"
         if kill -0 "${pid[t]}" 2>/dev/null; then
             [[ ${state[t]} != @(conn|lag) ]] && {
                 state[t]=lag
@@ -118,6 +117,7 @@ while true; do
         fi
 
         # Process disappeared. -> down
+        dbg 'No controller, cleaning up: %s' "${urls[t]}"
         [[ ${state[t]} != @(n/a|down|) ]] && {
             state[t]=down
             perr 'Connection Lost: %s' "${urls[t]}"
@@ -128,6 +128,7 @@ while true; do
 
 
         # No process, check service availability. -> unavailable
+        dbg 'Checking if available: %s (%s:%s)' "${urls[t]}" "$host" "$port"
         if ! nc -z "$host" "$port" &>/dev/null; then
             [[ ${state[t]} != n/a ]] && {
                 wrn 'Connection Unavailable: %s - %s:%d' "${urls[t]}" "$host" "$port"
@@ -177,8 +178,10 @@ while true; do
             ;;
 
             http*)
-                curl -sSnfo - "$url" >"${out[t]}" 2>"${err[t]}" &
+                set -x
+                curl -sSnfo - "${urls[t]}" >"${out[t]}" 2>"${err[t]}" &
                 state[t]=conn pid[t]=$!
+                set +x
             ;;
 
             *)
@@ -187,5 +190,6 @@ while true; do
         esac
     done
 
-    sleep 1
+    dbg 'Restarting in %ss' "$loopDelay"
+    sleep "$loopDelay"
 done