Merge pull request #4093 from wkloucek/improve-startup-errors

improve startup error logging
owncloud · Jul 5, 2022 · a9b66d4 · a9b66d4
2 parents b70f8de + f02591b
commit a9b66d4
Show file tree

Hide file tree

Showing 27 changed files with 87 additions and 49 deletions.
diff --git a/changelog/unreleased/fix-startup-error-logging.md b/changelog/unreleased/fix-startup-error-logging.md
@@ -0,0 +1,7 @@
+Bugfix: Fix startup error logging
+
+We've fixed the startup error logging, so that users will the reason for a failed
+startup even on "error" log level. Previously they would only see it on "info" log level.
+Also in a lot of cases the reason for the failed shutdown was omitted.
+
+https://github.com/owncloud/ocis/pull/4093
diff --git a/services/app-provider/pkg/command/server.go b/services/app-provider/pkg/command/server.go
@@ -53,9 +53,10 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
  Str("server", cfg.Service.Name).
+ Err(err).
  Msg("Shutting down server")
 
  cancel()

diff --git a/services/app-registry/pkg/command/server.go b/services/app-registry/pkg/command/server.go
@@ -52,9 +52,10 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
  Str("server", cfg.Service.Name).
+ Err(err).
  Msg("Shutting down server")
 
  cancel()

diff --git a/services/auth-basic/pkg/command/server.go b/services/auth-basic/pkg/command/server.go
@@ -66,9 +66,10 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
  Str("server", cfg.Service.Name).
+ Err(err).
  Msg("Shutting down server")
 
  cancel()

diff --git a/services/auth-bearer/pkg/command/server.go b/services/auth-bearer/pkg/command/server.go
@@ -53,9 +53,10 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
  Str("server", cfg.Service.Name).
+ Err(err).
  Msg("Shutting down server")
 
  cancel()

diff --git a/services/auth-machine/pkg/command/server.go b/services/auth-machine/pkg/command/server.go
@@ -53,8 +53,9 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Str("server", cfg.Service.Name).
  Msg("Shutting down server")
 

diff --git a/services/frontend/pkg/command/server.go b/services/frontend/pkg/command/server.go
@@ -53,8 +53,9 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Str("server", cfg.Service.Name).
  Msg("Shutting down server")
 

diff --git a/services/gateway/pkg/command/server.go b/services/gateway/pkg/command/server.go
@@ -52,8 +52,9 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Str("server", cfg.Service.Name).
  Msg("Shutting down server")
 

diff --git a/services/graph-explorer/pkg/command/server.go b/services/graph-explorer/pkg/command/server.go
@@ -75,9 +75,10 @@ func Server(cfg *config.Config) *cli.Command {
  Msg("Failed to start server")
  }
  return err
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
  Str("transport", "http").
+ Err(err).
  Msg("Shutting down server")
 
  cancel()

diff --git a/services/graph/pkg/command/server.go b/services/graph/pkg/command/server.go
@@ -66,9 +66,10 @@ func Server(cfg *config.Config) *cli.Command {
 
  gr.Add(func() error {
  return server.Run()
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
  Str("transport", "http").
+ Err(err).
  Msg("Shutting down server")
 
  cancel()

diff --git a/services/groups/pkg/command/server.go b/services/groups/pkg/command/server.go
@@ -66,9 +66,10 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
  Str("server", cfg.Service.Name).
+ Err(err).
  Msg("Shutting down server")
 
  cancel()

diff --git a/services/idp/pkg/command/server.go b/services/idp/pkg/command/server.go
@@ -91,9 +91,10 @@ func Server(cfg *config.Config) *cli.Command {
 
  gr.Add(func() error {
  return server.Run()
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
  Str("transport", "http").
+ Err(err).
  Msg("Shutting down server")
 
  cancel()

diff --git a/services/nats/pkg/command/server.go b/services/nats/pkg/command/server.go
@@ -62,8 +62,9 @@ func Server(cfg *config.Config) *cli.Command {
  return <-err
  }
 
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Msg("Shutting down server")
 
  natsServer.Shutdown()

diff --git a/services/ocdav/pkg/command/server.go b/services/ocdav/pkg/command/server.go
@@ -80,7 +80,10 @@ func Server(cfg *config.Config) *cli.Command {
 
  return s.Run()
  }, func(err error) {
- logger.Info().Err(err).Str("server", c.Command.Name).Msg("Shutting down server")
+ logger.Error().
+ Err(err).
+ Str("server", c.Command.Name).
+ Msg("Shutting down server")
  cancel()
  })
 

diff --git a/services/ocs/pkg/command/server.go b/services/ocs/pkg/command/server.go
@@ -63,7 +63,7 @@ func Server(cfg *config.Config) *cli.Command {
  )
 
  if err != nil {
- logger.Info().
+ logger.Error().
  Err(err).
  Str("transport", "http").
  Msg("Failed to initialize server")
@@ -73,8 +73,9 @@ func Server(cfg *config.Config) *cli.Command {
 
  gr.Add(func() error {
  return server.Run()
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Str("transport", "http").
  Msg("Shutting down server")
 

diff --git a/services/proxy/pkg/command/server.go b/services/proxy/pkg/command/server.go
@@ -97,8 +97,9 @@ func Server(cfg *config.Config) *cli.Command {
 
  gr.Add(func() error {
  return server.Run()
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Str("server", "http").
  Msg("Shutting down server")
 

diff --git a/services/search/pkg/command/server.go b/services/search/pkg/command/server.go
@@ -59,7 +59,10 @@ func Server(cfg *config.Config) *cli.Command {
  )
 
  gr.Add(grpcServer.Run, func(_ error) {
- logger.Info().Str("server", "grpc").Msg("shutting down server")
+ logger.Error().
+ Err(err).
+ Str("server", "grpc").
+ Msg("shutting down server")
  cancel()
  })
 

diff --git a/services/sharing/pkg/command/server.go b/services/sharing/pkg/command/server.go
@@ -66,8 +66,9 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Str("server", cfg.Service.Name).
  Msg("Shutting down server")
 

diff --git a/services/storage-publiclink/pkg/command/server.go b/services/storage-publiclink/pkg/command/server.go
@@ -53,8 +53,9 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Str("server", cfg.Service.Name).
  Msg("Shutting down server")
 

diff --git a/services/storage-shares/pkg/command/server.go b/services/storage-shares/pkg/command/server.go
@@ -53,8 +53,9 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Str("server", cfg.Service.Name).
  Msg("Shutting down server")
 

diff --git a/services/storage-system/pkg/command/server.go b/services/storage-system/pkg/command/server.go
@@ -53,8 +53,9 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Str("server", cfg.Service.Name).
  Msg("Shutting down server")
 

diff --git a/services/storage-users/pkg/command/server.go b/services/storage-users/pkg/command/server.go
@@ -53,8 +53,9 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Str("server", cfg.Service.Name).
  Msg("Shutting down server")
 

diff --git a/services/store/pkg/command/server.go b/services/store/pkg/command/server.go
@@ -62,8 +62,9 @@ func Server(cfg *config.Config) *cli.Command {
  grpc.Metrics(metrics),
  )
 
- gr.Add(server.Run, func(_ error) {
- logger.Info().
+ gr.Add(server.Run, func(err error) {
+ logger.Error().
+ Err(err).
  Str("server", "grpc").
  Msg("Shutting down server")
 

diff --git a/services/thumbnails/pkg/command/server.go b/services/thumbnails/pkg/command/server.go
@@ -65,7 +65,11 @@ func Server(cfg *config.Config) *cli.Command {
  )
 
  gr.Add(service.Run, func(_ error) {
- fmt.Println("shutting down grpc server")
+ logger.Error().
+ Err(err).
+ Str("server", "grpc").
+ Msg("Shutting down server")
+
  cancel()
  })
 

diff --git a/services/users/pkg/command/server.go b/services/users/pkg/command/server.go
@@ -66,8 +66,9 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
  return nil
- }, func(_ error) {
- logger.Info().
+ }, func(err error) {
+ logger.Error().
+ Err(err).
  Str("server", cfg.Service.Name).
  Msg("Shutting down server")
 

diff --git a/services/web/pkg/command/server.go b/services/web/pkg/command/server.go
@@ -92,7 +92,7 @@ func Server(cfg *config.Config) *cli.Command {
  Msg("Failed to start server")
  }
  return err
- }, func(_ error) {
+ }, func(err error) {
  logger.Info().
  Str("transport", "http").
  Msg("Shutting down server")

diff --git a/services/webdav/pkg/command/server.go b/services/webdav/pkg/command/server.go
@@ -73,8 +73,8 @@ func Server(cfg *config.Config) *cli.Command {
  gr.Add(func() error {
  return server.Run()
  }, func(err error) {
- logger.Error().Err(err).Msg("error ")
- logger.Info().
+ logger.Error().
+  Err(err).
  Str("transport", "http").
  Msg("Shutting down server")