From c83b209137e94cd2943fd08829d40a476fb932a7 Mon Sep 17 00:00:00 2001
From: Timothy Stack <stack@flux.utah.edu>
Date: Thu, 24 Feb 2005 14:59:54 +0000
Subject: [PATCH] fix a race between watchdog and garcia-pilot starting up.

---
 tmcd/common/watchdog | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tmcd/common/watchdog b/tmcd/common/watchdog
index 023881fd4..6290577e4 100755
--- a/tmcd/common/watchdog
+++ b/tmcd/common/watchdog
@@ -526,7 +526,7 @@ sub setintervals($)
     if ($report) {
 	logmsg("setintervals: check=$iv{check}, isalive=$iv{isalive}, ".
 	       "drift=$iv{drift}, cvsup=$iv{cvsup}, rusage=$iv{rusage}, ".
-	       "hostkeys=$iv{hkeys} battery=$iv{batt}\n");
+	       "hostkeys=$iv{hkeys}, battery=$iv{batt}\n");
     }
 
     #
@@ -785,12 +785,11 @@ sub sendbatt($)
     }
 
     if (! -r $battlog) {
-	logmsg("batt: no battery log $battlog\n");
-	$iv{batt} = 0;
-	return;
+	logmsg("batt: no battery log yet $battlog\n");
+	goto resched;
     }
 
-    my $line = `tail -1 /var/log/battery.log`;
+    my $line = `tail -1 $battlog`;
     my $capacity;
     my $voltage;
 
@@ -837,6 +836,7 @@ sub sendbatt($)
 	}
     }
 
+resched:
     #
     # Set up for another interval.
     # Since the tmcc call and update can take awhile, we update curtime
-- 
GitLab