X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=trigger-rcmd.git;a=blobdiff_plain;f=scripts%2Ftrigger-rcmd;h=17fd8a345b2973c75f2c073f13a1bac9ed52e71e;hp=89f61f1b148d37a817106b3c0df3a50e9b371c6f;hb=cf9579bd60b626db8da8fc20e1cced0199c47202;hpb=e04c3d3e6b022dde068384674bfe238756cca427;ds=sidebyside

diff --git a/scripts/trigger-rcmd b/scripts/trigger-rcmd
index 89f61f1..17fd8a3 100755
--- a/scripts/trigger-rcmd
+++ b/scripts/trigger-rcmd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # trigger-rcmp: Trigger remote commands
-# Copyright (c)2014 Alexander Barton (alex@barton.de)
+# Copyright (c)2014-2015 Alexander Barton (alex@barton.de)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,11 +15,20 @@ RCMD_D="/usr/local/etc/rcmd.d"
 
 PATH="$PATH:/usr/local/sbin:/usr/sbin"
 
+do_help() {
+	echo "Usage: $0 [--no-wake|-n] <rcmd> [<rcmd> [...]]" >&2
+	exit 2
+}
+
 do_rcmd() {
 	SYSTEM="localhost"
 	IFACE="eth0"
 	CMD="uptime"
-	TIMEOUT="180"
+	TIMEOUT="300"
+	SSH_CHECKS="6"
+	WAKE_DELAY="10s"
+	BOOT_DELAY="1m"
+	SHUTDOWN_TIME="+10"
 
 	. "$cnf"
 
@@ -33,6 +42,11 @@ do_rcmd() {
 	echo "$NAME: checking system \"$SYSTEM\" ..."
 	fping -c1 -q "$SYSTEM" 2>/dev/null
 	if [ $? -ne 0 ]; then
+		if [ -n "$NO_WAKE" ]; then
+			echo "$NAME: \"$SYSTEM\" seems to be down, skipping job."
+			return 9
+		fi
+
 		echo "$NAME: \"$SYSTEM\" seems to be down, wake it up ..."
 		etherwake -b -i "$IFACE" `echo "$SYSTEM" | cut -d'.' -f1`
 		if [ $? -ne 0 ]; then
@@ -50,17 +64,30 @@ do_rcmd() {
 			echo "$NAME: failed to wake \"$SYSTEM\"!" >&2
 			return 4
 		fi
-		sleep 3
+		sleep "$WAKE_DELAY"
 		rsys_was_running=0
 	else
 		echo "$NAME: \"$SYSTEM\" is already alive, ok."
 		rsys_was_running=1
 	fi
 
+	for i in `seq 1 $SSH_CHECKS`; do
+		echo "$NAME: checking SSH connection ($i/$SSH_CHECKS) ..."
+		ssh -q -o "ServerAliveInterval 120" "$SYSTEM" true >/dev/null 2>&1 && break
+		echo "$NAME: SSH on \"$SYSTEM\" not ready. Waiting ..."
+		sleep 10s
+	done
+	echo "$NAME: ok, SSH seems to be available on \"$SYSTEM\"."
+
+	if [ "$rsys_was_running" -eq 0 ]; then
+		echo "$NAME: \"$SYSTEM\" just started up. Delaying actions for $BOOT_DELAY ..."
+		sleep "$BOOT_DELAY"
+	fi
+
 	echo "$NAME: calling \"$CMD\" on \"$SYSTEM\" ..."
 	echo
 
-	ssh -q "$SYSTEM" "$CMD" </dev/null ; r=$?
+	ssh -q  -o "ServerAliveInterval 120" "$SYSTEM" "$CMD" </dev/null ; r=$?
 
 	echo
 	echo "$NAME: remote command ended with return code $r."
@@ -70,7 +97,7 @@ do_rcmd() {
 		rsys_users=`ssh -q "$SYSTEM" w | tail -n +3 | wc -l`
 		if [ "$rsys_users" = "0" ]; then
 			echo "$NAME: power off \"$SYSTEM\" again ..."
-			ssh -q "$SYSTEM" "sync; shutdown -hP +1"
+			ssh -q  -o "ServerAliveInterval 120" "$SYSTEM" "sync; shutdown -hP $SHUTDOWN_TIME" >/dev/null
 			if [ $? -ne 0 ]; then
 				echo "$NAME: failed to power off \"$SYSTEM\"!" >&2
 				return 5
@@ -87,10 +114,31 @@ do_rcmd() {
 	[ $r -eq 0 ] && return 0 || return 1
 }
 
-if [ $# -lt 1 ]; then
-	echo "Usage: $0 <rcmd> [<rcms> [...]]" >&2
-	exit 2
-fi
+# Defaults
+NO_WAKE=
+
+# Check required tools
+for t in fping ssh etherwake; do
+	type "$t" >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "$NAME: Required tool \"$t\" missing, aborting!"
+		exit 3
+	fi
+done
+
+while [ $# -gt 0 ]; do
+	case "$1" in
+	  --no-wake|-n)
+		NO_WAKE=1; ;;
+	  --help|-*)
+		do_help; ;;
+	  *)
+		break
+	esac
+	shift
+done
+
+[ $# -gt 0 ] || do_help
 
 result=0
 while [ $# -gt 0 ]; do