cloud/ocis
1
0
Fork 0
mirror of https://github.com/owncloud/ocis.git synced 2025-04-18 23:44:07 +03:00
Code

align shutdown logging

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer 2024-10-25 01:07:04 +02:00
parent ad43ae824c
commit dde999d5c2
38 changed files with 461 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
services/activitylog/pkg/command/server.go
View File

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

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

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

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

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

15
services/audit/pkg/command/server.go
View File

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

15
services/auth-app/pkg/command/server.go
View File

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

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

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

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

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

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

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

15
services/auth-service/pkg/command/server.go
View File

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

15
services/clientlog/pkg/command/server.go
View File

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

13
services/collaboration/pkg/command/server.go
View File

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

15
services/eventhistory/pkg/command/server.go
View File

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

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

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

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

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

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

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

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

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

15
services/idm/pkg/command/server.go
View File

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

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

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

15
services/invitations/pkg/command/server.go
View File

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

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

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

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

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

15
services/ocm/pkg/command/server.go
View File

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

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

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

16
services/postprocessing/pkg/command/server.go
View File

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

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

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

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

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

32
services/settings/pkg/command/server.go
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

15
services/userlog/pkg/command/server.go
View File

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

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

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

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

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

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

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

15
services/webfinger/pkg/command/server.go
View File

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