Move cleanup to exit handler

edgerun · May 19, 2020 · e00fec2 · e00fec2
1 parent dcd6ece
commit e00fec2
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/cmd/telemd/main.go b/cmd/telemd/main.go
@@ -37,7 +37,6 @@ func main() {
 	if err != nil {
 		log.Fatal("error initializing node info", err)
 	}
-	defer commandServer.RemoveNodeInfo()
 
 	telemetryReporter := telemd.NewRedisReporter(daemon, redisClient)
 
@@ -48,15 +47,14 @@ func main() {
 		<-sigs
 		log.Println("stopping daemon")
 		commandServer.Stop()
+		commandServer.RemoveNodeInfo()
 		telemetryReporter.Stop()
 		daemon.Stop()
 	}()
 
 	go commandServer.Run()
 	go telemetryReporter.Run()
 
-	defer redisClient.Close()
-
 	log.Println("running daemon")
 	daemon.Run() // blocks until everything has shut down after daemon.Stop()
 	log.Println("exiting")