mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-04 19:19:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

improve startup error logging

Browse Source
This commit is contained in:
Willy Kloucek
2022-07-05 08:41:21 +02:00
parent 25ca4150b0
commit f02591b5c3
27 changed files with 87 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
changelog/unreleased/fix-startup-error-logging.md Normal file
View File

@@ -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

5
services/app-provider/pkg/command/server.go
View File

@@ -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()

5
services/app-registry/pkg/command/server.go
View File

@@ -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()

5
services/auth-basic/pkg/command/server.go
View File

@@ -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()

5
services/auth-bearer/pkg/command/server.go
View File

@@ -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()

5
services/auth-machine/pkg/command/server.go
View File

@@ -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")

5
services/frontend/pkg/command/server.go
View File

@@ -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")

5
services/gateway/pkg/command/server.go
View File

@@ -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")

5
services/graph-explorer/pkg/command/server.go
View File

@@ -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()

5
services/graph/pkg/command/server.go
View File

@@ -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()

5
services/groups/pkg/command/server.go
View File

@@ -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()

5
services/idp/pkg/command/server.go
View File

@@ -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()

5
services/nats/pkg/command/server.go
View File

@@ -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()

5
services/ocdav/pkg/command/server.go
View File

@@ -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()
})

7
services/ocs/pkg/command/server.go
View File

@@ -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")

5
services/proxy/pkg/command/server.go
View File

@@ -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")

5
services/search/pkg/command/server.go
View File

@@ -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()
})

5
services/sharing/pkg/command/server.go
View File

@@ -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")

5
services/storage-publiclink/pkg/command/server.go
View File

@@ -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")

5
services/storage-shares/pkg/command/server.go
View File

@@ -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")

5
services/storage-system/pkg/command/server.go
View File

@@ -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")

5
services/storage-users/pkg/command/server.go
View File

@@ -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")

5
services/store/pkg/command/server.go
View File

@@ -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")

6
services/thumbnails/pkg/command/server.go
View File

@@ -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()
})

5
services/users/pkg/command/server.go
View File

@@ -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")

2
services/web/pkg/command/server.go
View File

@@ -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")

4
services/webdav/pkg/command/server.go
View File

@@ -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")