From e41472234f5064d2609459d899c0074b439567bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 26 Apr 2024 17:03:49 +0200 Subject: [PATCH] log and trace fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- services/frontend/pkg/command/events.go | 13 +++++++------ services/graph/pkg/identity/cache.go | 3 +++ services/postprocessing/pkg/command/server.go | 1 + services/search/pkg/config/http.go | 8 -------- services/settings/pkg/command/server.go | 12 +++++++++--- services/sharing/pkg/command/server.go | 2 +- services/storage-publiclink/pkg/command/server.go | 2 +- services/storage-shares/pkg/command/server.go | 2 +- services/storage-system/pkg/command/server.go | 2 +- services/storage-users/pkg/command/server.go | 2 +- services/thumbnails/pkg/command/server.go | 5 ++++- services/userlog/pkg/command/server.go | 2 +- services/users/pkg/command/server.go | 2 +- services/web/pkg/command/server.go | 5 +++-- services/webdav/pkg/command/server.go | 4 ++-- services/webfinger/pkg/command/server.go | 4 ++-- 16 files changed, 38 insertions(+), 31 deletions(-) delete mode 100644 services/search/pkg/config/http.go diff --git a/services/frontend/pkg/command/events.go b/services/frontend/pkg/command/events.go index b9012d42c..b7cb4b621 100644 --- a/services/frontend/pkg/command/events.go +++ b/services/frontend/pkg/command/events.go @@ -56,23 +56,24 @@ func ListenForEvents(ctx context.Context, cfg *config.Config, l log.Logger) erro return err } + traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name) + if err != nil { + l.Error().Err(err).Msg("cannot initialize tracing") + return err + } + gatewaySelector, err := pool.GatewaySelector( cfg.Reva.Address, pool.WithTLSCACert(cfg.GRPCClientTLS.CACert), pool.WithTLSMode(tm), pool.WithRegistry(registry.GetRegistry()), + pool.WithTracerProvider(traceProvider), ) if err != nil { l.Error().Err(err).Msg("cannot get gateway selector") return err } - traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name) - if err != nil { - l.Error().Err(err).Msg("cannot initialize tracing") - return err - } - grpcClient, err := grpc.NewClient( append( grpc.GetClientOptions(cfg.GRPCClientTLS), diff --git a/services/graph/pkg/identity/cache.go b/services/graph/pkg/identity/cache.go index 57d835b08..a5670d13a 100644 --- a/services/graph/pkg/identity/cache.go +++ b/services/graph/pkg/identity/cache.go @@ -88,6 +88,9 @@ func (cache IdentityCache) GetUser(ctx context.Context, userid string) (libregra var user libregraph.User if item := cache.users.Get(userid); item == nil { gatewayClient, err := cache.gatewaySelector.Next() + if err != nil { + return libregraph.User{}, errorcode.New(errorcode.GeneralException, err.Error()) + } cs3UserID := &cs3User.UserId{ OpaqueId: userid, } diff --git a/services/postprocessing/pkg/command/server.go b/services/postprocessing/pkg/command/server.go index f8b9095cd..f5033c123 100644 --- a/services/postprocessing/pkg/command/server.go +++ b/services/postprocessing/pkg/command/server.go @@ -85,6 +85,7 @@ func Server(cfg *config.Config) *cli.Command { }, func(err error) { logger.Error(). Err(err). + Str("server", "http"). Msg("Shutting down server") cancel() os.Exit(1) diff --git a/services/search/pkg/config/http.go b/services/search/pkg/config/http.go deleted file mode 100644 index 3e27042cb..000000000 --- a/services/search/pkg/config/http.go +++ /dev/null @@ -1,8 +0,0 @@ -package config - -// HTTP defines the available http configuration. -type HTTP struct { - Addr string `ocisConfig:"addr" env:"SEARCH_HTTP_ADDR" desc:"The bind address of the HTTP service." introductionVersion:"pre5.0"` - Namespace string `ocisConfig:"-" yaml:"-"` - Root string `ocisConfig:"root" env:"SEARCH_HTTP_ROOT" desc:"Subdirectory that serves as the root for this HTTP service." introductionVersion:"pre5.0"` -} diff --git a/services/settings/pkg/command/server.go b/services/settings/pkg/command/server.go index b06302188..bcdb7f247 100644 --- a/services/settings/pkg/command/server.go +++ b/services/settings/pkg/command/server.go @@ -73,8 +73,11 @@ func Server(cfg *config.Config) *cli.Command { Msg("Error initializing http service") return fmt.Errorf("could not initialize http service: %w", err) } - servers.Add(httpServer.Run, func(_ error) { - logger.Info().Str("server", "http").Msg("Shutting down server") + servers.Add(httpServer.Run, func(err error) { + logger.Error(). + Err(err). + Str("server", "http"). + Msg("shutting down server") cancel() os.Exit(1) }) @@ -90,7 +93,10 @@ func Server(cfg *config.Config) *cli.Command { grpc.TraceProvider(traceProvider), ) servers.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() os.Exit(1) }) diff --git a/services/sharing/pkg/command/server.go b/services/sharing/pkg/command/server.go index 61f72d65c..c0a89bfb9 100644 --- a/services/sharing/pkg/command/server.go +++ b/services/sharing/pkg/command/server.go @@ -73,7 +73,7 @@ func Server(cfg *config.Config) *cli.Command { }, func(err error) { logger.Error(). Err(err). - Str("server", cfg.Service.Name). + Str("server", "reva"). Msg("Shutting down server") cancel() diff --git a/services/storage-publiclink/pkg/command/server.go b/services/storage-publiclink/pkg/command/server.go index 18da72cee..b0829d472 100644 --- a/services/storage-publiclink/pkg/command/server.go +++ b/services/storage-publiclink/pkg/command/server.go @@ -57,7 +57,7 @@ func Server(cfg *config.Config) *cli.Command { }, func(err error) { logger.Error(). Err(err). - Str("server", cfg.Service.Name). + Str("server", "reva"). Msg("Shutting down server") cancel() diff --git a/services/storage-shares/pkg/command/server.go b/services/storage-shares/pkg/command/server.go index 8af5b1fa3..d7c186a1f 100644 --- a/services/storage-shares/pkg/command/server.go +++ b/services/storage-shares/pkg/command/server.go @@ -57,7 +57,7 @@ func Server(cfg *config.Config) *cli.Command { }, func(err error) { logger.Error(). Err(err). - Str("server", cfg.Service.Name). + Str("server", "reva"). Msg("Shutting down server") cancel() diff --git a/services/storage-system/pkg/command/server.go b/services/storage-system/pkg/command/server.go index 00618bb9a..5424a456e 100644 --- a/services/storage-system/pkg/command/server.go +++ b/services/storage-system/pkg/command/server.go @@ -57,7 +57,7 @@ func Server(cfg *config.Config) *cli.Command { }, func(err error) { logger.Error(). Err(err). - Str("server", cfg.Service.Name). + Str("server", "reva"). Msg("Shutting down server") cancel() diff --git a/services/storage-users/pkg/command/server.go b/services/storage-users/pkg/command/server.go index 3cf533cce..8a13bc78e 100644 --- a/services/storage-users/pkg/command/server.go +++ b/services/storage-users/pkg/command/server.go @@ -59,7 +59,7 @@ func Server(cfg *config.Config) *cli.Command { }, func(err error) { logger.Error(). Err(err). - Str("server", cfg.Service.Name). + Str("server", "reva"). Msg("Shutting down server") cancel() diff --git a/services/thumbnails/pkg/command/server.go b/services/thumbnails/pkg/command/server.go index 8482fa9e4..580e70e88 100644 --- a/services/thumbnails/pkg/command/server.go +++ b/services/thumbnails/pkg/command/server.go @@ -109,7 +109,10 @@ func Server(cfg *config.Config) *cli.Command { } gr.Add(httpServer.Run, func(_ error) { - logger.Info().Str("server", "http").Msg("shutting down server") + logger.Error(). + Err(err). + Str("server", "http"). + Msg("Shutting down server") cancel() }) diff --git a/services/userlog/pkg/command/server.go b/services/userlog/pkg/command/server.go index 00637c85d..a0d2e9966 100644 --- a/services/userlog/pkg/command/server.go +++ b/services/userlog/pkg/command/server.go @@ -141,8 +141,8 @@ func Server(cfg *config.Config) *cli.Command { return server.Run() }, func(err error) { logger.Error(). - Str("transport", "http"). Err(err). + Str("server", "http"). Msg("Shutting down server") cancel() diff --git a/services/users/pkg/command/server.go b/services/users/pkg/command/server.go index d5894fbb5..100dea31b 100644 --- a/services/users/pkg/command/server.go +++ b/services/users/pkg/command/server.go @@ -70,7 +70,7 @@ func Server(cfg *config.Config) *cli.Command { }, func(err error) { logger.Error(). Err(err). - Str("server", cfg.Service.Name). + Str("server", "reva"). Msg("Shutting down server") cancel() diff --git a/services/web/pkg/command/server.go b/services/web/pkg/command/server.go index c967ece84..7f515fdf4 100644 --- a/services/web/pkg/command/server.go +++ b/services/web/pkg/command/server.go @@ -88,8 +88,9 @@ func Server(cfg *config.Config) *cli.Command { } return err }, func(err error) { - logger.Info(). - Str("transport", "http"). + logger.Error(). + Err(err). + Str("server", "http"). Msg("Shutting down server") cancel() diff --git a/services/webdav/pkg/command/server.go b/services/webdav/pkg/command/server.go index a189dd36e..88983e1de 100644 --- a/services/webdav/pkg/command/server.go +++ b/services/webdav/pkg/command/server.go @@ -69,7 +69,7 @@ func Server(cfg *config.Config) *cli.Command { if err != nil { logger.Info(). Err(err). - Str("transport", "http"). + Str("server", "http"). Msg("Failed to initialize server") return err @@ -80,7 +80,7 @@ func Server(cfg *config.Config) *cli.Command { }, func(err error) { logger.Error(). Err(err). - Str("transport", "http"). + Str("server", "http"). Msg("Shutting down server") cancel() diff --git a/services/webfinger/pkg/command/server.go b/services/webfinger/pkg/command/server.go index cfba7bf68..17e6022f0 100644 --- a/services/webfinger/pkg/command/server.go +++ b/services/webfinger/pkg/command/server.go @@ -82,7 +82,7 @@ func Server(cfg *config.Config) *cli.Command { if err != nil { logger.Info(). Err(err). - Str("transport", "http"). + Str("server", "http"). Msg("Failed to initialize server") return err @@ -93,7 +93,7 @@ func Server(cfg *config.Config) *cli.Command { }, func(err error) { logger.Error(). Err(err). - Str("transport", "http"). + Str("server", "http"). Msg("Shutting down server") cancel()