do not force exit to let all services shutdown gracefully

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2026-02-04 19:19:03 -06:00 · 2024-07-24 14:02:52 +02:00
parent 9d1515e8fc
commit 7999e2969b
35 changed files with 0 additions and 51 deletions
--- a/services/activitylog/pkg/command/server.go
+++ b/services/activitylog/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/stream"
@@ -140,7 +139,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}

--- a/services/app-provider/pkg/command/server.go
+++ b/services/app-provider/pkg/command/server.go
@@ -61,7 +61,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")

 				cancel()
-				os.Exit(1)
 			})

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

 				cancel()
-				os.Exit(1)
 			})

 			debugServer, err := debug.Server(
--- a/services/audit/pkg/command/server.go
+++ b/services/audit/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/stream"
@@ -55,7 +54,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Err(err).
 					Msg("Shutting down server")
 				cancel()
-				os.Exit(1)
 			})

 			{
--- a/services/auth-app/pkg/command/server.go
+++ b/services/auth-app/pkg/command/server.go
@@ -61,7 +61,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")

 				cancel()
-				os.Exit(1)
 			})

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

 				cancel()
-				os.Exit(1)
 			})

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

 				cancel()
-				os.Exit(1)
 			})

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

 				cancel()
-				os.Exit(1)
 			})

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

 				cancel()
-				os.Exit(1)
 			})

 			debugServer, err := debug.Server(
--- a/services/clientlog/pkg/command/server.go
+++ b/services/clientlog/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/stream"
@@ -113,7 +112,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}

--- a/services/frontend/pkg/command/server.go
+++ b/services/frontend/pkg/command/server.go
@@ -65,7 +65,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")

 				cancel()
-				os.Exit(1)
 			})

 			debugServer, err := debug.Server(
--- a/services/graph/pkg/command/server.go
+++ b/services/graph/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -64,7 +63,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}

--- a/services/groups/pkg/command/server.go
+++ b/services/groups/pkg/command/server.go
@@ -74,7 +74,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")

 				cancel()
-				os.Exit(1)
 			})

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

--- a/services/idp/pkg/command/server.go
+++ b/services/idp/pkg/command/server.go
@@ -90,7 +90,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}

--- a/services/invitations/pkg/command/server.go
+++ b/services/invitations/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -84,7 +83,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}

--- a/services/nats/pkg/command/server.go
+++ b/services/nats/pkg/command/server.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	"os"

 	"github.com/oklog/run"

@@ -109,7 +108,6 @@ func Server(cfg *config.Config) *cli.Command {

 				natsServer.Shutdown()
 				cancel()
-				os.Exit(1)
 			})

 			return gr.Run()
--- a/services/ocdav/pkg/command/server.go
+++ b/services/ocdav/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/cs3org/reva/v2/pkg/micro/ocdav"
 	"github.com/cs3org/reva/v2/pkg/sharedconf"
@@ -104,7 +103,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Str("server", c.Command.Name).
 					Msg("Shutting down server")
 				cancel()
-				os.Exit(1)
 			})

 			debugServer, err := debug.Server(
--- a/services/ocm/pkg/command/server.go
+++ b/services/ocm/pkg/command/server.go
@@ -62,7 +62,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")

 				cancel()
-				os.Exit(1)
 			})

 			debugServer, err := debug.Server(
--- a/services/ocs/pkg/command/server.go
+++ b/services/ocs/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -77,7 +76,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}

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

--- a/services/proxy/pkg/command/server.go
+++ b/services/proxy/pkg/command/server.go
@@ -5,7 +5,6 @@ import (
 	"crypto/tls"
 	"fmt"
 	"net/http"
-	"os"
 	"time"

 	gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
@@ -216,7 +215,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}

--- a/services/settings/pkg/command/server.go
+++ b/services/settings/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -74,7 +73,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Str("server", "http").
 					Msg("shutting down server")
 				cancel()
-				os.Exit(1)
 			})

 			// prepare a gRPC server and add it to the group run.
@@ -93,7 +91,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Str("server", "grpc").
 					Msg("shutting down server")
 				cancel()
-				os.Exit(1)
 			})

 			// prepare a debug server and add it to the group run.
--- a/services/sharing/pkg/command/server.go
+++ b/services/sharing/pkg/command/server.go
@@ -77,7 +77,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")

 				cancel()
-				os.Exit(1)
 			})

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

 				cancel()
-				os.Exit(1)
 			})

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

 				cancel()
-				os.Exit(1)
 			})

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

 				cancel()
-				os.Exit(1)
 			})

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

 				cancel()
-				os.Exit(1)
 			})

 			debugServer, err := debug.Server(
--- a/services/store/pkg/command/server.go
+++ b/services/store/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/oklog/run"

@@ -68,7 +67,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}

--- a/services/thumbnails/pkg/command/server.go
+++ b/services/thumbnails/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -69,7 +68,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")

 				cancel()
-				os.Exit(1)
 			})

 			server, err := debug.Server(
--- a/services/userlog/pkg/command/server.go
+++ b/services/userlog/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/stream"
@@ -141,7 +140,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}

--- a/services/users/pkg/command/server.go
+++ b/services/users/pkg/command/server.go
@@ -74,7 +74,6 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Shutting down server")

 				cancel()
-				os.Exit(1)
 			})

 			debugServer, err := debug.Server(
--- a/services/web/pkg/command/server.go
+++ b/services/web/pkg/command/server.go
@@ -89,7 +89,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}

--- a/services/webdav/pkg/command/server.go
+++ b/services/webdav/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -79,7 +78,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}

--- a/services/webfinger/pkg/command/server.go
+++ b/services/webfinger/pkg/command/server.go
@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"

 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
@@ -92,7 +91,6 @@ func Server(cfg *config.Config) *cli.Command {
 						Msg("Shutting down server")

 					cancel()
-					os.Exit(1)
 				})
 			}