From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 12 Oct 2017 17:29:44 +0000 (+0100)
Subject: probes: Break out do-report-log
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?p=modbot-ulm.git;a=commitdiff_plain;h=a6d8635fc4da8185f5a84842c346a6abaddf616a

probes: Break out do-report-log

No functional change.
---

diff --git a/probes/modrelays-probe b/probes/modrelays-probe
index 22f00a7..521a040 100755
--- a/probes/modrelays-probe
+++ b/probes/modrelays-probe
@@ -224,6 +224,11 @@ acquire_lock () {
 	exec with-lock-ex $lock_mode "$lockfile" "$0" "$mode" "$@"
 }
 
+do-report-log () {
+	# implicitly uses $outcome, $reported etc. - see maybe-report
+	echo "$outcome" >"$attempt"/reported
+}
+
 maybe-report () {
 	local outcome=$1
 
@@ -240,7 +245,7 @@ maybe-report () {
 	if [ "x$outcome" = "x$reported" ]; then return; fi
 
 	if [ x"$outcome" = x"ok" ] && [ x"$reported" = x ]; then
-		echo ok >"$attempt/reported"
+		do-report-log
 		return
 	fi
 
@@ -320,7 +325,7 @@ END
 END
 
 	/usr/sbin/sendmail -odb -oem -oee -t <"$email"
-	echo "$outcome" >"$attempt"/reported
+	do-report-log
 }
 
 mode_report () {