From dde999d5c27603673e6ab92e05da4349bf96e68a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 25 Oct 2024 01:07:04 +0200 Subject: [PATCH] align shutdown logging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- services/activitylog/pkg/command/server.go | 15 ++++++--- services/app-provider/pkg/command/server.go | 15 ++++++--- services/app-registry/pkg/command/server.go | 15 ++++++--- services/audit/pkg/command/server.go | 15 +++++++-- services/auth-app/pkg/command/server.go | 15 ++++++--- services/auth-basic/pkg/command/server.go | 15 ++++++--- services/auth-bearer/pkg/command/server.go | 15 ++++++--- services/auth-machine/pkg/command/server.go | 15 ++++++--- services/auth-service/pkg/command/server.go | 15 ++++++--- services/clientlog/pkg/command/server.go | 15 ++++++--- services/collaboration/pkg/command/server.go | 13 +++++++- services/eventhistory/pkg/command/server.go | 15 ++++++--- services/frontend/pkg/command/server.go | 15 ++++++--- services/gateway/pkg/command/server.go | 15 ++++++--- services/graph/pkg/command/server.go | 15 ++++++--- services/groups/pkg/command/server.go | 15 ++++++--- services/idm/pkg/command/server.go | 15 +++++++-- services/idp/pkg/command/server.go | 15 ++++++--- services/invitations/pkg/command/server.go | 15 ++++++--- services/nats/pkg/command/server.go | 14 ++++++-- services/ocdav/pkg/command/server.go | 16 +++++++--- services/ocm/pkg/command/server.go | 15 ++++++--- services/ocs/pkg/command/server.go | 15 ++++++--- services/postprocessing/pkg/command/server.go | 16 +++++++--- services/proxy/pkg/command/server.go | 15 ++++++--- services/search/pkg/command/server.go | 16 +++++++--- services/settings/pkg/command/server.go | 32 ++++++++++++++----- services/sharing/pkg/command/server.go | 15 ++++++--- .../storage-publiclink/pkg/command/server.go | 15 ++++++--- services/storage-shares/pkg/command/server.go | 15 ++++++--- services/storage-system/pkg/command/server.go | 15 ++++++--- services/storage-users/pkg/command/server.go | 32 +++++++++++++------ services/thumbnails/pkg/command/server.go | 31 +++++++++++++----- services/userlog/pkg/command/server.go | 15 ++++++--- services/users/pkg/command/server.go | 15 ++++++--- services/web/pkg/command/server.go | 15 ++++++--- services/webdav/pkg/command/server.go | 15 ++++++--- services/webfinger/pkg/command/server.go | 15 ++++++--- 38 files changed, 461 insertions(+), 159 deletions(-) diff --git a/services/activitylog/pkg/command/server.go b/services/activitylog/pkg/command/server.go index 67fa7ad9c6..9490e588f9 100644 --- a/services/activitylog/pkg/command/server.go +++ b/services/activitylog/pkg/command/server.go @@ -134,10 +134,17 @@ func Server(cfg *config.Config) *cli.Command { gr.Add(func() error { return svc.Run() }, func(err error) { - logger.Error(). - Str("transport", "http"). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/app-provider/pkg/command/server.go b/services/app-provider/pkg/command/server.go index 28a7f89b77..4711b01602 100644 --- a/services/app-provider/pkg/command/server.go +++ b/services/app-provider/pkg/command/server.go @@ -54,10 +54,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Str("server", cfg.Service.Name). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/app-registry/pkg/command/server.go b/services/app-registry/pkg/command/server.go index b37f29a768..14f4ab277f 100644 --- a/services/app-registry/pkg/command/server.go +++ b/services/app-registry/pkg/command/server.go @@ -54,10 +54,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Str("server", cfg.Service.Name). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/audit/pkg/command/server.go b/services/audit/pkg/command/server.go index 84bf206bc9..61503c7fb1 100644 --- a/services/audit/pkg/command/server.go +++ b/services/audit/pkg/command/server.go @@ -49,9 +49,18 @@ func Server(cfg *config.Config) *cli.Command { svc.AuditLoggerFromConfig(ctx, cfg.Auditlog, evts, logger) return nil }, func(err error) { - logger.Error(). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "stream"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "stream"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } + cancel() }) diff --git a/services/auth-app/pkg/command/server.go b/services/auth-app/pkg/command/server.go index 10ba77b1ca..96ead3230c 100644 --- a/services/auth-app/pkg/command/server.go +++ b/services/auth-app/pkg/command/server.go @@ -62,10 +62,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Str("server", cfg.Service.Name). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/auth-basic/pkg/command/server.go b/services/auth-basic/pkg/command/server.go index a6d7d95ecb..37204df408 100644 --- a/services/auth-basic/pkg/command/server.go +++ b/services/auth-basic/pkg/command/server.go @@ -67,10 +67,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Str("server", cfg.Service.Name). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/auth-bearer/pkg/command/server.go b/services/auth-bearer/pkg/command/server.go index e6d93f7a2c..8056387f96 100644 --- a/services/auth-bearer/pkg/command/server.go +++ b/services/auth-bearer/pkg/command/server.go @@ -54,10 +54,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Str("server", cfg.Service.Name). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/auth-machine/pkg/command/server.go b/services/auth-machine/pkg/command/server.go index d5d996c9af..84d039a20a 100644 --- a/services/auth-machine/pkg/command/server.go +++ b/services/auth-machine/pkg/command/server.go @@ -54,10 +54,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Err(err). - Str("server", cfg.Service.Name). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/auth-service/pkg/command/server.go b/services/auth-service/pkg/command/server.go index e01773cca6..887cdd1cb4 100644 --- a/services/auth-service/pkg/command/server.go +++ b/services/auth-service/pkg/command/server.go @@ -54,10 +54,17 @@ func Server(cfg *config.Config) *cli.Command { ) return nil }, func(err error) { - logger.Error(). - Err(err). - Str("server", cfg.Service.Name). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/clientlog/pkg/command/server.go b/services/clientlog/pkg/command/server.go index b2194f792b..9a7a05cf31 100644 --- a/services/clientlog/pkg/command/server.go +++ b/services/clientlog/pkg/command/server.go @@ -106,10 +106,17 @@ func Server(cfg *config.Config) *cli.Command { gr.Add(func() error { return svc.Run() }, func(err error) { - logger.Error(). - Str("transport", "http"). - Err(err). - Msg("Shutting down server") + if err != nil { + logger.Info(). + Str("transport", "stream"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "stream"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/collaboration/pkg/command/server.go b/services/collaboration/pkg/command/server.go index fbfcc88f91..51c788bc23 100644 --- a/services/collaboration/pkg/command/server.go +++ b/services/collaboration/pkg/command/server.go @@ -103,7 +103,18 @@ func Server(cfg *config.Config) *cli.Command { return grpcServer.Serve(l) }, func(err error) { - logger.Error().Err(err).Str("server", "grpc").Msg("shutting down server") + if err != nil { + logger.Info(). + Str("transport", "grpc"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "grpc"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } + cancel() }) diff --git a/services/eventhistory/pkg/command/server.go b/services/eventhistory/pkg/command/server.go index 15e0dfd932..1fc33fdb3a 100644 --- a/services/eventhistory/pkg/command/server.go +++ b/services/eventhistory/pkg/command/server.go @@ -83,10 +83,17 @@ func Server(cfg *config.Config) *cli.Command { ) gr.Add(service.Run, func(err error) { - logger.Error(). - Err(err). - Str("server", "grpc"). - Msg("Shutting Down server") + if err == nil { + logger.Info(). + Str("transport", "grpc"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "grpc"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/frontend/pkg/command/server.go b/services/frontend/pkg/command/server.go index ece6241014..e9597d7042 100644 --- a/services/frontend/pkg/command/server.go +++ b/services/frontend/pkg/command/server.go @@ -58,10 +58,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Err(err). - Str("server", cfg.Service.Name). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/gateway/pkg/command/server.go b/services/gateway/pkg/command/server.go index bafbf7cd82..905db3bb3b 100644 --- a/services/gateway/pkg/command/server.go +++ b/services/gateway/pkg/command/server.go @@ -56,10 +56,17 @@ func Server(cfg *config.Config) *cli.Command { Msg("reva runtime exited") return nil }, func(err error) { - logger.Error(). - Err(err). - Str("server", cfg.Service.Name). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/graph/pkg/command/server.go b/services/graph/pkg/command/server.go index 7c10c330ba..c8820d4efd 100644 --- a/services/graph/pkg/command/server.go +++ b/services/graph/pkg/command/server.go @@ -57,10 +57,17 @@ func Server(cfg *config.Config) *cli.Command { gr.Add(func() error { return server.Run() }, func(err error) { - logger.Error(). - Str("transport", "http"). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/groups/pkg/command/server.go b/services/groups/pkg/command/server.go index 36c83a03b2..b5d6030d2e 100644 --- a/services/groups/pkg/command/server.go +++ b/services/groups/pkg/command/server.go @@ -67,10 +67,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Str("server", cfg.Service.Name). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/idm/pkg/command/server.go b/services/idm/pkg/command/server.go index 87d058de91..237d2a0ec9 100644 --- a/services/idm/pkg/command/server.go +++ b/services/idm/pkg/command/server.go @@ -85,9 +85,18 @@ func Server(cfg *config.Config) *cli.Command { return <-err } }, func(err error) { - logger.Error(). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } + cancel() }) } diff --git a/services/idp/pkg/command/server.go b/services/idp/pkg/command/server.go index 9c12ac619f..355f2f6ca0 100644 --- a/services/idp/pkg/command/server.go +++ b/services/idp/pkg/command/server.go @@ -87,10 +87,17 @@ func Server(cfg *config.Config) *cli.Command { gr.Add(func() error { return server.Run() }, func(err error) { - logger.Error(). - Str("transport", "http"). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/invitations/pkg/command/server.go b/services/invitations/pkg/command/server.go index 24f0003804..c2137e9d2d 100644 --- a/services/invitations/pkg/command/server.go +++ b/services/invitations/pkg/command/server.go @@ -77,10 +77,17 @@ func Server(cfg *config.Config) *cli.Command { gr.Add(func() error { return server.Run() }, func(err error) { - logger.Error(). - Err(err). - Str("transport", "http"). - Msg("Shutting down server") + if err != nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/nats/pkg/command/server.go b/services/nats/pkg/command/server.go index 4a7df8d180..2412c43f63 100644 --- a/services/nats/pkg/command/server.go +++ b/services/nats/pkg/command/server.go @@ -99,9 +99,17 @@ func Server(cfg *config.Config) *cli.Command { } }, func(err error) { - logger.Error(). - Err(err). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "nats"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "nats"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } natsServer.Shutdown() cancel() diff --git a/services/ocdav/pkg/command/server.go b/services/ocdav/pkg/command/server.go index 4272419e84..e6eaaf4c71 100644 --- a/services/ocdav/pkg/command/server.go +++ b/services/ocdav/pkg/command/server.go @@ -98,10 +98,18 @@ func Server(cfg *config.Config) *cli.Command { return s.Run() }, func(err error) { - logger.Error(). - Err(err). - Str("server", c.Command.Name). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } + cancel() }) diff --git a/services/ocm/pkg/command/server.go b/services/ocm/pkg/command/server.go index 64fced6883..eb12be1e3d 100644 --- a/services/ocm/pkg/command/server.go +++ b/services/ocm/pkg/command/server.go @@ -55,10 +55,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Err(err). - Str("server", cfg.Service.Name). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/ocs/pkg/command/server.go b/services/ocs/pkg/command/server.go index 1054ea2e28..474f32735b 100644 --- a/services/ocs/pkg/command/server.go +++ b/services/ocs/pkg/command/server.go @@ -70,10 +70,17 @@ func Server(cfg *config.Config) *cli.Command { gr.Add(func() error { return server.Run() }, func(err error) { - logger.Error(). - Err(err). - Str("transport", "http"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/postprocessing/pkg/command/server.go b/services/postprocessing/pkg/command/server.go index 51eba2a38f..ef47a3bebe 100644 --- a/services/postprocessing/pkg/command/server.go +++ b/services/postprocessing/pkg/command/server.go @@ -75,10 +75,18 @@ func Server(cfg *config.Config) *cli.Command { return <-err } }, func(err error) { - logger.Error(). - Err(err). - Str("server", "http"). - Msg("Shutting down server") + if err != nil { + logger.Info(). + Str("transport", "stream"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "stream"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } + cancel() }) } diff --git a/services/proxy/pkg/command/server.go b/services/proxy/pkg/command/server.go index fb6af95e7d..a8a47fe8d4 100644 --- a/services/proxy/pkg/command/server.go +++ b/services/proxy/pkg/command/server.go @@ -203,10 +203,17 @@ func Server(cfg *config.Config) *cli.Command { gr.Add(func() error { return server.Run() }, func(err error) { - logger.Error(). - Err(err). - Str("server", "http"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/search/pkg/command/server.go b/services/search/pkg/command/server.go index f098602a67..05d38e9b85 100644 --- a/services/search/pkg/command/server.go +++ b/services/search/pkg/command/server.go @@ -63,10 +63,18 @@ func Server(cfg *config.Config) *cli.Command { } gr.Add(grpcServer.Run, func(_ error) { - logger.Error(). - Err(err). - Str("server", "grpc"). - Msg("shutting down server") + if err == nil { + logger.Info(). + Str("transport", "grpc"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "grpc"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } + cancel() }) diff --git a/services/settings/pkg/command/server.go b/services/settings/pkg/command/server.go index 1e442ab6fd..6b6ef631a8 100644 --- a/services/settings/pkg/command/server.go +++ b/services/settings/pkg/command/server.go @@ -68,10 +68,18 @@ func Server(cfg *config.Config) *cli.Command { return fmt.Errorf("could not initialize http service: %w", err) } servers.Add(httpServer.Run, func(err error) { - logger.Error(). - Err(err). - Str("server", "http"). - Msg("shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } + cancel() }) @@ -86,10 +94,18 @@ func Server(cfg *config.Config) *cli.Command { grpc.TraceProvider(traceProvider), ) servers.Add(grpcServer.Run, func(_ error) { - logger.Error(). - Err(err). - Str("server", "grpc"). - Msg("shutting down server") + if err == nil { + logger.Info(). + Str("transport", "grpc"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "grpc"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } + cancel() }) diff --git a/services/sharing/pkg/command/server.go b/services/sharing/pkg/command/server.go index 94d91a91c7..4948f813d3 100644 --- a/services/sharing/pkg/command/server.go +++ b/services/sharing/pkg/command/server.go @@ -70,10 +70,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Err(err). - Str("server", "reva"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/storage-publiclink/pkg/command/server.go b/services/storage-publiclink/pkg/command/server.go index 9a0c399160..ed1621caee 100644 --- a/services/storage-publiclink/pkg/command/server.go +++ b/services/storage-publiclink/pkg/command/server.go @@ -54,10 +54,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Err(err). - Str("server", "reva"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/storage-shares/pkg/command/server.go b/services/storage-shares/pkg/command/server.go index 7ed4bec258..1311ef99be 100644 --- a/services/storage-shares/pkg/command/server.go +++ b/services/storage-shares/pkg/command/server.go @@ -54,10 +54,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Err(err). - Str("server", "reva"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/storage-system/pkg/command/server.go b/services/storage-system/pkg/command/server.go index 2c2e058cb6..88efdf0510 100644 --- a/services/storage-system/pkg/command/server.go +++ b/services/storage-system/pkg/command/server.go @@ -54,10 +54,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Err(err). - Str("server", "reva"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/storage-users/pkg/command/server.go b/services/storage-users/pkg/command/server.go index db64d57a37..a100cc4f59 100644 --- a/services/storage-users/pkg/command/server.go +++ b/services/storage-users/pkg/command/server.go @@ -56,10 +56,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Err(err). - Str("server", "reva"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) @@ -100,11 +107,18 @@ func Server(cfg *config.Config) *cli.Command { logger.Fatal().Err(err).Msg("can't create event handler") } - gr.Add(eventSVC.Run, func(_ error) { - logger.Error(). - Err(err). - Str("server", cfg.Service.Name). - Msg("Shutting down event handler") + gr.Add(eventSVC.Run, func(err error) { + if err == nil { + logger.Info(). + Str("transport", "stream"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "stream"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/thumbnails/pkg/command/server.go b/services/thumbnails/pkg/command/server.go index 4ad5ae0fdd..075dc35a6d 100644 --- a/services/thumbnails/pkg/command/server.go +++ b/services/thumbnails/pkg/command/server.go @@ -63,10 +63,17 @@ func Server(cfg *config.Config) *cli.Command { ) gr.Add(service.Run, func(_ error) { - logger.Error(). - Err(err). - Str("server", "grpc"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "grpc"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "grpc"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) @@ -104,10 +111,18 @@ func Server(cfg *config.Config) *cli.Command { } gr.Add(httpServer.Run, func(_ error) { - logger.Error(). - Err(err). - Str("server", "http"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } + cancel() }) diff --git a/services/userlog/pkg/command/server.go b/services/userlog/pkg/command/server.go index b86ff9c382..314d6c2409 100644 --- a/services/userlog/pkg/command/server.go +++ b/services/userlog/pkg/command/server.go @@ -133,10 +133,17 @@ func Server(cfg *config.Config) *cli.Command { gr.Add(func() error { return server.Run() }, func(err error) { - logger.Error(). - Err(err). - Str("server", "http"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/users/pkg/command/server.go b/services/users/pkg/command/server.go index 115b58af3c..7cabbfeeac 100644 --- a/services/users/pkg/command/server.go +++ b/services/users/pkg/command/server.go @@ -67,10 +67,17 @@ func Server(cfg *config.Config) *cli.Command { return nil }, func(err error) { - logger.Error(). - Err(err). - Str("server", "reva"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "reva"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/web/pkg/command/server.go b/services/web/pkg/command/server.go index 73ceba8cce..9fa3d395e4 100644 --- a/services/web/pkg/command/server.go +++ b/services/web/pkg/command/server.go @@ -83,10 +83,17 @@ func Server(cfg *config.Config) *cli.Command { } return err }, func(err error) { - logger.Error(). - Err(err). - Str("server", "http"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/webdav/pkg/command/server.go b/services/webdav/pkg/command/server.go index 869b80f0ca..dbe90821f4 100644 --- a/services/webdav/pkg/command/server.go +++ b/services/webdav/pkg/command/server.go @@ -72,10 +72,17 @@ func Server(cfg *config.Config) *cli.Command { gr.Add(func() error { return server.Run() }, func(err error) { - logger.Error(). - Err(err). - Str("server", "http"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() }) diff --git a/services/webfinger/pkg/command/server.go b/services/webfinger/pkg/command/server.go index 0088349687..966bf360bb 100644 --- a/services/webfinger/pkg/command/server.go +++ b/services/webfinger/pkg/command/server.go @@ -85,10 +85,17 @@ func Server(cfg *config.Config) *cli.Command { gr.Add(func() error { return server.Run() }, func(err error) { - logger.Error(). - Err(err). - Str("server", "http"). - Msg("Shutting down server") + if err == nil { + logger.Info(). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } else { + logger.Error().Err(err). + Str("transport", "http"). + Str("server", cfg.Service.Name). + Msg("Shutting down server") + } cancel() })