Fix: incorrect name in notifications, different reboot logic

network/wifi.go

@@ -14,11 +14,12 @@ func UpdateWifiCredentials(ssid, password string) error {
 
 // RebootMachine calls sync and reboots the machine
 func RebootMachine() {
-	log.Println("[INFO] Rebooting...")
+	go func() {
+		log.Println("[INFO] Rebooting...")
+	}()
 
 	// Wait before exiting, in order to give our parent enough time to finish
-	countdownBeforeExit := time.NewTimer(time.Second * 3)
-	<-countdownBeforeExit.C
+	time.Sleep(3 * time.Second)
 
 	log.Println("[WARN] Not running on Linux/ARM, so not rebooting")
 }

network/wifi_linux_arm.go

@@ -32,12 +32,13 @@ func UpdateWifiCredentials(ssid, password string) error {
 
 // RebootMachine calls sync and reboots the machine
 func RebootMachine() {
-	log.Println("[INFO] Rebooting...")
-	syscall.Sync()
+	go func() {
+		log.Println("[INFO] Rebooting...")
+		syscall.Sync()
+	}()
 
 	// Wait before exiting, in order to give our parent enough time to finish
-	countdownBeforeExit := time.NewTimer(time.Second * 3)
-	<-countdownBeforeExit.C
+	time.Sleep(3 * time.Second)
 
 	syscall.Reboot(syscall.LINUX_REBOOT_CMD_RESTART)
 }

sensordata/collect_linux_arm.go

@@ -280,7 +280,7 @@ func sendPushoverNotification(c data.ConfigDB, runningTime int) error {
 		//	Create a new client and push a message
 		pushClient := pushover.New(pushAPIkey.Value)
 		recipient := pushover.NewRecipient(pushTo.Value)
-		message := pushover.NewMessage(fmt.Sprintf("%v has finished running.  It ran for about %v minutes", applianceName, runningTime))
+		message := pushover.NewMessage(fmt.Sprintf("%s has finished running.  It ran for about %v minutes", applianceName.Value, runningTime))
 		message.Sound = "bike"
 		_, err := pushClient.SendMessage(message, recipient)
 		if err != nil {