hard exit when services fail

Signed-off-by: jkoberg <jkoberg@owncloud.com>
owncloud · Sep 19, 2023 · 6587e59 · 6587e59
1 parent 7c9ce23
commit 6587e59
Show file tree

Hide file tree

Showing 33 changed files with 58 additions and 0 deletions.
diff --git a/services/app-provider/pkg/command/server.go b/services/app-provider/pkg/command/server.go
@@ -61,6 +61,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/app-registry/pkg/command/server.go b/services/app-registry/pkg/command/server.go
@@ -60,6 +60,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/audit/pkg/command/server.go b/services/audit/pkg/command/server.go
@@ -3,6 +3,7 @@ package command
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/stream"
@@ -59,6 +60,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Err(err).
 					Msg("Shutting down server")
 				cancel()
+				os.Exit(1)
 			})
 
 			{

diff --git a/services/auth-basic/pkg/command/server.go b/services/auth-basic/pkg/command/server.go
@@ -74,6 +74,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/auth-bearer/pkg/command/server.go b/services/auth-bearer/pkg/command/server.go
@@ -61,6 +61,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/auth-machine/pkg/command/server.go b/services/auth-machine/pkg/command/server.go
@@ -61,6 +61,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/auth-service/pkg/command/server.go b/services/auth-service/pkg/command/server.go
@@ -56,6 +56,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/clientlog/pkg/command/server.go b/services/clientlog/pkg/command/server.go
@@ -3,6 +3,7 @@ package command
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/stream"
@@ -100,6 +101,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")
 
 					cancel()
+					os.Exit(1)
 				})
 			}
 

diff --git a/services/frontend/pkg/command/server.go b/services/frontend/pkg/command/server.go
@@ -65,6 +65,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(
@@ -97,6 +98,16 @@ func Server(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
+			if true {
+				logger.Error().
+					Err(err).
+					Str("server", cfg.Service.Name).
+					Msg("Shutting down server")
+
+				cancel()
+				os.Exit(1)
+			}
+
 			return gr.Run()
 		},
 	}

diff --git a/services/gateway/pkg/command/server.go b/services/gateway/pkg/command/server.go
@@ -60,6 +60,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/graph/pkg/command/server.go b/services/graph/pkg/command/server.go
@@ -3,6 +3,7 @@ package command
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -68,6 +69,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")
 
 					cancel()
+					os.Exit(1)
 				})
 			}
 

diff --git a/services/groups/pkg/command/server.go b/services/groups/pkg/command/server.go
@@ -74,6 +74,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/idm/pkg/command/server.go b/services/idm/pkg/command/server.go
@@ -95,6 +95,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Err(err).
 						Msg("Shutting down server")
 					cancel()
+					os.Exit(1)
 				})
 			}
 

diff --git a/services/idp/pkg/command/server.go b/services/idp/pkg/command/server.go
@@ -95,6 +95,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")
 
 					cancel()
+					os.Exit(1)
 				})
 			}
 

diff --git a/services/invitations/pkg/command/server.go b/services/invitations/pkg/command/server.go
@@ -3,6 +3,7 @@ package command
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -88,6 +89,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")
 
 					cancel()
+					os.Exit(1)
 				})
 			}
 

diff --git a/services/nats/pkg/command/server.go b/services/nats/pkg/command/server.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"os"
 
 	"github.com/oklog/run"
 
@@ -113,6 +114,7 @@ func Server(cfg *config.Config) *cli.Command {
 
 				natsServer.Shutdown()
 				cancel()
+				os.Exit(1)
 			})
 
 			return gr.Run()

diff --git a/services/ocdav/pkg/command/server.go b/services/ocdav/pkg/command/server.go
@@ -3,6 +3,7 @@ package command
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/cs3org/reva/v2/pkg/micro/ocdav"
 	"github.com/cs3org/reva/v2/pkg/sharedconf"
@@ -99,6 +100,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Str("server", c.Command.Name).
 					Msg("Shutting down server")
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/ocs/pkg/command/server.go b/services/ocs/pkg/command/server.go
@@ -3,6 +3,7 @@ package command
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
@@ -81,6 +82,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")
 
 					cancel()
+					os.Exit(1)
 				})
 			}
 

diff --git a/services/postprocessing/pkg/command/server.go b/services/postprocessing/pkg/command/server.go
@@ -86,6 +86,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Err(err).
 						Msg("Shutting down server")
 					cancel()
+					os.Exit(1)
 				})
 			}
 

diff --git a/services/proxy/pkg/command/server.go b/services/proxy/pkg/command/server.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"os"
 	"time"
 
 	"github.com/go-chi/chi/v5"
@@ -154,6 +155,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")
 
 					cancel()
+					os.Exit(1)
 				})
 			}
 

diff --git a/services/settings/pkg/command/server.go b/services/settings/pkg/command/server.go
@@ -3,6 +3,7 @@ package command
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -75,6 +76,7 @@ func Server(cfg *config.Config) *cli.Command {
 			servers.Add(httpServer.Run, func(_ error) {
 				logger.Info().Str("server", "http").Msg("Shutting down server")
 				cancel()
+				os.Exit(1)
 			})
 
 			// prepare a gRPC server and add it to the group run.
@@ -90,6 +92,7 @@ func Server(cfg *config.Config) *cli.Command {
 			servers.Add(grpcServer.Run, func(_ error) {
 				logger.Info().Str("server", "grpc").Msg("Shutting down server")
 				cancel()
+				os.Exit(1)
 			})
 
 			// prepare a debug server and add it to the group run.

diff --git a/services/sharing/pkg/command/server.go b/services/sharing/pkg/command/server.go
@@ -74,6 +74,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/storage-publiclink/pkg/command/server.go b/services/storage-publiclink/pkg/command/server.go
@@ -61,6 +61,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/storage-shares/pkg/command/server.go b/services/storage-shares/pkg/command/server.go
@@ -61,6 +61,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/storage-system/pkg/command/server.go b/services/storage-system/pkg/command/server.go
@@ -61,6 +61,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/storage-users/pkg/command/server.go b/services/storage-users/pkg/command/server.go
@@ -63,6 +63,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/store/pkg/command/server.go b/services/store/pkg/command/server.go
@@ -3,6 +3,7 @@ package command
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/oklog/run"
 
@@ -75,6 +76,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")
 
 					cancel()
+					os.Exit(1)
 				})
 			}
 

diff --git a/services/thumbnails/pkg/command/server.go b/services/thumbnails/pkg/command/server.go
@@ -3,6 +3,7 @@ package command
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -73,6 +74,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			server, err := debug.Server(

diff --git a/services/userlog/pkg/command/server.go b/services/userlog/pkg/command/server.go
@@ -3,6 +3,7 @@ package command
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/stream"
@@ -144,6 +145,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")
 
 					cancel()
+					os.Exit(1)
 				})
 			}
 

diff --git a/services/users/pkg/command/server.go b/services/users/pkg/command/server.go
@@ -74,6 +74,7 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")
 
 				cancel()
+				os.Exit(1)
 			})
 
 			debugServer, err := debug.Server(

diff --git a/services/web/pkg/command/server.go b/services/web/pkg/command/server.go
@@ -93,6 +93,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")
 
 					cancel()
+					os.Exit(1)
 				})
 			}
 

diff --git a/services/webdav/pkg/command/server.go b/services/webdav/pkg/command/server.go
@@ -3,6 +3,7 @@ package command
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -83,6 +84,7 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")
 
 					cancel()
+					os.Exit(1)
 				})
 			}
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,6 +95,7 @@ func Server(cfg *config.Config) *cli.Command { @@
     						Msg("Shutting down server")
     					cancel()
+    					os.Exit(1)
     				})
     			}
@@ Expand Down @@