reuse exit function

Signed-off-by: SammyOina <sammyoina@gmail.com>
absmach · Jul 19, 2023 · d644cac · d644cac
1 parent 3b7fcf4
commit d644cac
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 69 deletions.
diff --git a/cmd/bootstrap/main.go b/cmd/bootstrap/main.go
@@ -88,9 +88,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer db.Close()
 
 	// Create new redis client for bootstrap event store

diff --git a/cmd/cassandra-reader/main.go b/cmd/cassandra-reader/main.go
@@ -71,9 +71,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer tcHandler.Close()
 	logger.Info("Successfully connected to things grpc server " + tcHandler.Secure())
 

diff --git a/cmd/cassandra-writer/main.go b/cmd/cassandra-writer/main.go
@@ -75,9 +75,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer csdSession.Close()
 
 	tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, instanceID)

diff --git a/cmd/certs/main.go b/cmd/certs/main.go
@@ -101,9 +101,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer db.Close()
 
 	auth, authHandler, err := authClient.Setup(envPrefix, svcName)

diff --git a/cmd/coap/main.go b/cmd/coap/main.go
@@ -73,9 +73,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer tcHandler.Close()
 	logger.Info("Successfully connected to things grpc server " + tcHandler.Secure())
 

diff --git a/cmd/http/main.go b/cmd/http/main.go
@@ -74,9 +74,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer tcHandler.Close()
 	logger.Info("Successfully connected to things grpc server " + tcHandler.Secure())
 

diff --git a/cmd/influxdb-reader/main.go b/cmd/influxdb-reader/main.go
@@ -70,9 +70,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer tcHandler.Close()
 	logger.Info("Successfully connected to things grpc server " + tcHandler.Secure())
 

diff --git a/cmd/influxdb-writer/main.go b/cmd/influxdb-writer/main.go
@@ -71,9 +71,7 @@ func main() {
 		logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err))
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer func() {
 		if err := tp.Shutdown(ctx); err != nil {
 			logger.Error(fmt.Sprintf("Error shutting down tracer provider: %v", err))

diff --git a/cmd/lora/main.go b/cmd/lora/main.go
@@ -88,9 +88,7 @@ func main() {
 		logger.Fatal(fmt.Sprintf("failed to setup route map redis client : %s", err))
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer rmConn.Close()
 
 	tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, instanceID)

diff --git a/cmd/mongodb-reader/main.go b/cmd/mongodb-reader/main.go
@@ -76,9 +76,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer tcHandler.Close()
 	logger.Info("Successfully connected to things grpc server " + tcHandler.Secure())
 

diff --git a/cmd/mongodb-writer/main.go b/cmd/mongodb-writer/main.go
@@ -73,9 +73,7 @@ func main() {
 		logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err))
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer func() {
 		if err := tp.Shutdown(ctx); err != nil {
 			logger.Error(fmt.Sprintf("Error shutting down tracer provider: %v", err))

diff --git a/cmd/mqtt/main.go b/cmd/mqtt/main.go
@@ -99,9 +99,7 @@ func main() {
 		logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err))
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer func() {
 		if err := tp.Shutdown(ctx); err != nil {
 			logger.Error(fmt.Sprintf("Error shutting down tracer provider: %v", err))

diff --git a/cmd/opcua/main.go b/cmd/opcua/main.go
@@ -95,9 +95,7 @@ func main() {
 		logger.Fatal(fmt.Sprintf("failed to setup %s bootstrap event store redis client : %s", svcName, err))
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer esConn.Close()
 
 	tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, instanceID)

diff --git a/cmd/postgres-reader/main.go b/cmd/postgres-reader/main.go
@@ -70,9 +70,7 @@ func main() {
 	}
 
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer tcHandler.Close()
 	logger.Info("Successfully connected to things grpc server " + tcHandler.Secure())
 

diff --git a/cmd/postgres-writer/main.go b/cmd/postgres-writer/main.go
@@ -73,9 +73,7 @@ func main() {
 		logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err))
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer func() {
 		if err := tp.Shutdown(ctx); err != nil {
 			logger.Error(fmt.Sprintf("Error shutting down tracer provider: %v", err))

diff --git a/cmd/smpp-notifier/main.go b/cmd/smpp-notifier/main.go
@@ -83,9 +83,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer db.Close()
 
 	smppConfig := mfsmpp.Config{}

diff --git a/cmd/smtp-notifier/main.go b/cmd/smtp-notifier/main.go
@@ -84,9 +84,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer db.Close()
 
 	ec := email.Config{}

diff --git a/cmd/things/main.go b/cmd/things/main.go
@@ -106,9 +106,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer db.Close()
 
 	tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, instanceID)

diff --git a/cmd/timescale-reader/main.go b/cmd/timescale-reader/main.go
@@ -73,9 +73,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer db.Close()
 
 	repo := newService(db, logger)

diff --git a/cmd/timescale-writer/main.go b/cmd/timescale-writer/main.go
@@ -75,9 +75,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer db.Close()
 
 	tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, instanceID)

diff --git a/cmd/twins/main.go b/cmd/twins/main.go
@@ -87,9 +87,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer cacheClient.Close()
 
 	// Setup new redis event store client

diff --git a/cmd/users/main.go b/cmd/users/main.go
@@ -115,9 +115,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer db.Close()
 
 	tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, instanceID)

diff --git a/cmd/ws/main.go b/cmd/ws/main.go
@@ -74,9 +74,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 	var exitCode int
-	defer func() {
-		os.Exit(exitCode)
-	}()
+	defer mflog.ExitWithError(&exitCode)
 	defer internal.Close(logger, tcHandler)
 	logger.Info("Successfully connected to things grpc server " + tcHandler.Secure())
 

diff --git a/logger/exit.go b/logger/exit.go
@@ -0,0 +1,8 @@
+package logger
+
+import "os"
+
+// ExitWithError closes the current process with error code.
+func ExitWithError(code *int) {
+	os.Exit(*code)
+}