X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?a=blobdiff_plain;f=probes%2Fmodrelays-probe;fp=probes%2Fmodrelays-probe;h=ef7c639bb2b90365b9e532078924438cf7bd2b8b;hb=7125403d58d2a281a699a8c53ab09bd7304aa048;hp=27c5545d6f78a661ce656c97d099ca900ad0d896;hpb=593412d7007f2eb7886b058b3aceee502d696836;p=modbot-urcm.git

diff --git a/probes/modrelays-probe b/probes/modrelays-probe
index 27c5545..ef7c639 100755
--- a/probes/modrelays-probe
+++ b/probes/modrelays-probe
@@ -32,6 +32,13 @@ record-probing () {
 	mkdir -p $td
 }
 
+record-probing-start () {
+	record-probing "$@"
+	if ! [ -e "$td/started" ]; then
+		date -R >"$td/started"
+	fi
+}
+
 record-outcome () {
 	local probeid=$1
 	local outcome=$2
@@ -50,7 +57,7 @@ probe-addr () {
 	local addr=$2
 
 	local td
-	record-probing "mx=$mx,addr=$addr"
+	record-probing-start "mx=$mx,addr=$addr"
 
 	set +e
 	swaks	--to "${GROUP//./-}@$domain" \
@@ -104,7 +111,7 @@ probe-addr () {
 probe-domain () {
 	local domain=$1
 	local td
-	record-probing dns
+	record-probing-start dns
 	
 	set +e
 	adnshost -Fi -Tn +Do +Dt -t mx $domain >$td/dns
@@ -242,6 +249,18 @@ Content-Transfer-Encoding: 7bit
 
 The moderation relay probe
   $info
+END
+
+	if [ -e "$attempt/started" ]; then
+		local started
+		read started <"$attempt/started"
+		cat >>"$email" <<END
+started at
+  $started
+END
+	fi
+
+	cat >>"$email" <<END
 resulted in the outcome
   $outcome
 END
@@ -274,6 +293,7 @@ END
 --$delim
 Content-Type: text/plain; charset="utf-8"
 Content-Disposition: inline; filename="${log##*/}"
+Content-Description: "${log##*/}"
 Content-Transfer-Encoding: 8bit
 
 END