Merge pull request #105 from jharshman/fix-heartbeat-func

Fix unexpected exit behavior in heartbeat func
bitly · Nov 30, 2020 · efaec0f · efaec0f
2 parents 2be1d05 + d2a8327
commit efaec0f
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/statsdaemon.go b/statsdaemon.go
@@ -578,21 +578,20 @@ func tcpListener() {
 
 func heartbeat() {
 	_, err := os.Stat(*heartbeatFilePath)
-	if os.IsNotExist(err) {
+	if err != nil && os.IsNotExist(err) {
 		file, err := os.Create(*heartbeatFilePath)
 		if err != nil {
 			log.Fatalf("ERROR: Creating heartbeat file - %s", err)
 		}
 		defer file.Close()
-	} else {
-		currentTime := time.Now()
-		err = os.Chtimes(*heartbeatFilePath, currentTime, currentTime)
-		if err != nil {
-			log.Fatalf("ERROR: Touching %s", err)
-		}
+	} else if err != nil {
+		log.Fatalf("ERROR: %s", err)
 	}
+
+	currentTime := time.Now()
+	err = os.Chtimes(*heartbeatFilePath, currentTime, currentTime)
 	if err != nil {
-		log.Fatalf("ERROR: %s", err)
+		log.Fatalf("ERROR: Touching %s", err)
 	}
 }