wait until active window for first heart beat

heartbeat.go

@@ -22,18 +22,22 @@ type Heartbeat struct {
 }
 
 func heartBeatLoop(window *window.Window) {
-	if !window.Active() {
-		log.Printf("After active window not sending heart beat")
-		return
-	}
 
 	hb, err := NewHeartbeat(window)
 	if err != nil {
 		log.Printf("Error starting up heart beat %v", err)
 		return
 	}
-	log.Printf("Sending initial heart beat in %v", heartBeatDelay)
-	time.Sleep(heartBeatDelay)
+	initialDelay := heartBeatDelay
+
+	if !window.Active() {
+		until := window.Until()
+		if until > initialDelay {
+			initialDelay = until
+		}
+	}
+	log.Printf("Sending initial heart beat in %v", initialDelay)
+	time.Sleep(initialDelay)
 
 	for {
 		attempt := 0

main.go

@@ -142,7 +142,6 @@ func runMain() error {
 	log.Println("started D-Bus service")
 
 	go heartBeatLoop(conf.OnWindow)
-
 	go updateWatchdogTimer(attiny)
 	if err := attiny.UpdateWifiState(); err != nil {
 		log.Println("failed to update wifi state:", err)
@@ -155,7 +154,7 @@ func runMain() error {
 	log.Printf("on window: %s", conf.OnWindow)
 
 	if conf.OnWindow.NoWindow {
-		log.Printf("no window active so pinging watchdog only")
+		log.Printf("no window so pinging watchdog only")
 		runtime.Goexit()
 	}