pkg: rename handle_signal to graceful_shutdown

Signed-off-by: Victor Login <batazor@evrone.com>
shortlink-org · Jul 2, 2023 · 794357e · 794357e
1 parent efc99a3
commit 794357e
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 53 deletions.
diff --git a/internal/pkg/graceful_shutdown/graceful_shutdown.go b/internal/pkg/graceful_shutdown/graceful_shutdown.go
@@ -0,0 +1,20 @@
+package graceful_shutdown
+
+import (
+	"os"
+	"os/signal"
+	"syscall"
+)
+
+func GracefulShutdown() os.Signal {
+	shutdownSignals := make(chan os.Signal, 1)
+
+	signal.Notify(
+		shutdownSignals,
+		syscall.SIGINT,
+		syscall.SIGQUIT,
+		syscall.SIGTERM,
+	)
+
+	return <-shutdownSignals
+}
diff --git a/internal/pkg/handle_signal/handle_signal.go b/internal/pkg/handle_signal/handle_signal.go
diff --git a/internal/services/api-gateway/gateways/cloudevents/cmd/api.go b/internal/services/api-gateway/gateways/cloudevents/cmd/api.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
 	_ "github.com/shortlink-org/shortlink/internal/pkg/i18n"
 	api_di "github.com/shortlink-org/shortlink/internal/services/api-gateway/gateways/cloudevents/di"
 )
@@ -33,7 +33,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	cleanup()
 

diff --git a/internal/services/api-gateway/gateways/graphql/cmd/api.go b/internal/services/api-gateway/gateways/graphql/cmd/api.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
 	_ "github.com/shortlink-org/shortlink/internal/pkg/i18n"
 	api_di "github.com/shortlink-org/shortlink/internal/services/api-gateway/gateways/graphql/di"
 )
@@ -33,7 +33,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	cleanup()
 

diff --git a/internal/services/api-gateway/gateways/grpc-web/cmd/api.go b/internal/services/api-gateway/gateways/grpc-web/cmd/api.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
 	_ "github.com/shortlink-org/shortlink/internal/pkg/i18n"
 	api_di "github.com/shortlink-org/shortlink/internal/services/api-gateway/gateways/grpc-web/di"
 )
@@ -33,7 +33,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	cleanup()
 

diff --git a/internal/services/api-gateway/gateways/http-chi/cmd/api.go b/internal/services/api-gateway/gateways/http-chi/cmd/api.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
 	_ "github.com/shortlink-org/shortlink/internal/pkg/i18n"
 	api_di "github.com/shortlink-org/shortlink/internal/services/api-gateway/gateways/http-chi/di"
 )
@@ -33,7 +33,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	cleanup()
 

diff --git a/internal/services/api-gateway/gateways/ws/cmd/ws.go b/internal/services/api-gateway/gateways/ws/cmd/ws.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
 	api_di "github.com/shortlink-org/shortlink/internal/services/api-gateway/gateways/ws/di"
 )
 
@@ -23,7 +23,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	cleanup()
 

diff --git a/internal/services/auth/cmd/auth.go b/internal/services/auth/cmd/auth.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
 	auth_di "github.com/shortlink-org/shortlink/internal/services/auth/di"
 )
 
@@ -30,7 +30,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	cleanup()
 

diff --git a/internal/services/bff-web/cmd/bff_web.go b/internal/services/bff-web/cmd/bff_web.go
@@ -8,9 +8,10 @@ package main
 import (
 	"os"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
-	bff_web_di "github.com/shortlink-org/shortlink/internal/services/bff-web/di"
 	"github.com/spf13/viper"
+
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
+	bff_web_di "github.com/shortlink-org/shortlink/internal/services/bff-web/di"
 )
 
 func main() {
@@ -29,7 +30,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	cleanup()
 

diff --git a/internal/services/billing/cmd/billing.go b/internal/services/billing/cmd/billing.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
 	billing_di "github.com/shortlink-org/shortlink/internal/services/billing/di"
 )
 
@@ -30,7 +30,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	cleanup()
 

diff --git a/internal/services/csi/cmd/csi.go b/internal/services/csi/cmd/csi.go
@@ -5,12 +5,13 @@ import (
 	"log"
 	"os"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
-	csi_di "github.com/shortlink-org/shortlink/internal/services/csi/di"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 	"github.com/spf13/viper"
 
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
+	csi_di "github.com/shortlink-org/shortlink/internal/services/csi/di"
+
 	csi_driver "github.com/shortlink-org/shortlink/internal/services/csi"
 )
 
@@ -74,7 +75,7 @@ func main() {
 	s.Log.Info("success run CSI plugin")
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	// Stop the service gracefully.
 	cleanup()

diff --git a/internal/services/link/cmd/link.go b/internal/services/link/cmd/link.go
@@ -8,9 +8,10 @@ package main
 import (
 	"os"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
-	link_di "github.com/shortlink-org/shortlink/internal/services/link/di"
 	"github.com/spf13/viper"
+
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
+	link_di "github.com/shortlink-org/shortlink/internal/services/link/di"
 )
 
 func main() {
@@ -29,7 +30,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	cleanup()
 

diff --git a/internal/services/logger/cmd/logger.go b/internal/services/logger/cmd/logger.go
@@ -8,9 +8,10 @@ package main
 import (
 	"os"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
-	logger_di "github.com/shortlink-org/shortlink/internal/services/logger/di"
 	"github.com/spf13/viper"
+
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
+	logger_di "github.com/shortlink-org/shortlink/internal/services/logger/di"
 )
 
 func main() {
@@ -29,7 +30,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	cleanup()
 

diff --git a/internal/services/metadata/cmd/metadata.go b/internal/services/metadata/cmd/metadata.go
@@ -8,9 +8,10 @@ package main
 import (
 	"os"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
-	metadata_di "github.com/shortlink-org/shortlink/internal/services/metadata/di"
 	"github.com/spf13/viper"
+
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
+	metadata_di "github.com/shortlink-org/shortlink/internal/services/metadata/di"
 )
 
 func main() {
@@ -29,7 +30,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	// Stop the service gracefully.
 	cleanup()

diff --git a/internal/services/notify/cmd/notify.go b/internal/services/notify/cmd/notify.go
@@ -6,9 +6,10 @@ package main
 import (
 	"os"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
-	notify_di "github.com/shortlink-org/shortlink/internal/services/notify/di"
 	"github.com/spf13/viper"
+
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
+	notify_di "github.com/shortlink-org/shortlink/internal/services/notify/di"
 )
 
 func main() {
@@ -27,7 +28,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	// Stop the service gracefully.
 	cleanup()

diff --git a/internal/services/wallet/cmd/wallet.go b/internal/services/wallet/cmd/wallet.go
@@ -8,9 +8,10 @@ package main
 import (
 	"os"
 
-	"github.com/shortlink-org/shortlink/internal/pkg/handle_signal"
-	wallet_di "github.com/shortlink-org/shortlink/internal/services/wallet/di"
 	"github.com/spf13/viper"
+
+	"github.com/shortlink-org/shortlink/internal/pkg/graceful_shutdown"
+	wallet_di "github.com/shortlink-org/shortlink/internal/services/wallet/di"
 )
 
 func main() {
@@ -29,7 +30,7 @@ func main() {
 	}()
 
 	// Handle SIGINT, SIGQUIT and SIGTERM.
-	handle_signal.WaitExitSignal()
+	graceful_shutdown.GracefulShutdown()
 
 	cleanup()