remove Log prefix from configlog functions

This commit is contained in:
Willy Kloucek
2022-08-22 08:08:18 +02:00
parent e58eaabdeb
commit 9f2be9f4f9
91 changed files with 100 additions and 100 deletions

View File

@@ -5,23 +5,23 @@ import (
"os"
)
// LogError logs the error
func LogError(err error) {
// Error logs the error
func Error(err error) {
if err != nil {
fmt.Printf("%v\n", err)
}
}
// LogError logs the error and returns it unchanged
func LogReturnError(err error) error {
// ReturnError logs the error and returns it unchanged
func ReturnError(err error) error {
if err != nil {
fmt.Printf("%v\n", err)
}
return err
}
// LogReturnFatal logs the error and calls os.Exit(1) and returns nil if no error is passed
func LogReturnFatal(err error) error {
// ReturnFatal logs the error and calls os.Exit(1) and returns nil if no error is passed
func ReturnFatal(err error) error {
if err != nil {
fmt.Printf("%v\n", err)
os.Exit(1)

View File

@@ -17,7 +17,7 @@ func AppProviderCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.AppProvider.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.AppProvider.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func AppRegistryCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.AppRegistry.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.AppRegistry.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func AuditCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Audit.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Audit.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func AuthBasicCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.AuthBasic.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.AuthBasic.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func AuthBearerCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.AuthBearer.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.AuthBearer.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func AuthMachineCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.AuthMachine.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.AuthMachine.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func FrontendCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Frontend.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Frontend.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func GatewayCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Gateway.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Gateway.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func GraphExplorerCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.GraphExplorer.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.GraphExplorer.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func GraphCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Graph.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Graph.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func GroupsCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Groups.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Groups.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func IDMCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.IDM.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.IDM.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func IDPCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.IDP.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.IDP.Commons = cfg.Commons
return nil
},

View File

@@ -57,12 +57,12 @@ func MigrateShares(cfg *config.Config) *cli.Command {
Before: func(c *cli.Context) error {
// Parse base config
if err := parser.ParseConfig(cfg, true); err != nil {
return configlog.LogReturnError(err)
return configlog.ReturnError(err)
}
// Parse sharing config
cfg.Sharing.Commons = cfg.Commons
return configlog.LogReturnError(sharingparser.ParseConfig(cfg.Sharing))
return configlog.ReturnError(sharingparser.ParseConfig(cfg.Sharing))
},
Action: func(c *cli.Context) error {
log := zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}).With().Timestamp().Logger()
@@ -152,12 +152,12 @@ func MigratePublicShares(cfg *config.Config) *cli.Command {
Before: func(c *cli.Context) error {
// Parse base config
if err := parser.ParseConfig(cfg, true); err != nil {
return configlog.LogReturnError(err)
return configlog.ReturnError(err)
}
// Parse sharing config
cfg.Sharing.Commons = cfg.Commons
return configlog.LogReturnError(sharingparser.ParseConfig(cfg.Sharing))
return configlog.ReturnError(sharingparser.ParseConfig(cfg.Sharing))
},
Action: func(c *cli.Context) error {
log := zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}).With().Timestamp().Logger()

View File

@@ -17,7 +17,7 @@ func NatsCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Nats.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Nats.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func NotificationsCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Notifications.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Notifications.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func OCDavCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.OCDav.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.OCDav.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func OCSCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.OCS.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.OCS.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func ProxyCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Proxy.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Proxy.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func SearchCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Search.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Search.Commons = cfg.Commons
return nil
},

View File

@@ -16,7 +16,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: "start a fullstack server (runtime and all services in supervised mode)",
Category: "fullstack",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg, false))
return configlog.ReturnError(parser.ParseConfig(cfg, false))
},
Action: func(c *cli.Context) error {
r := runtime.New(cfg)

View File

@@ -17,7 +17,7 @@ func SettingsCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Settings.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Settings.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func SharingCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Sharing.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Sharing.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func StoragePublicLinkCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.StoragePublicLink.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.StoragePublicLink.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func StorageSharesCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.StorageShares.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.StorageShares.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func StorageSystemCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.StorageSystem.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.StorageSystem.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func StorageUsersCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.StorageUsers.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.StorageUsers.Commons = cfg.Commons
return nil
},

View File

@@ -18,7 +18,7 @@ func StoreCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Store.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Store.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func ThumbnailsCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Thumbnails.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Thumbnails.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func UsersCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Users.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Users.Commons = cfg.Commons
return nil
},

View File

@@ -17,7 +17,7 @@ func WebCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.Web.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.Web.Commons = cfg.Commons
return nil
},

View File

@@ -18,7 +18,7 @@ func WebDAVCommand(cfg *config.Config) *cli.Command {
Usage: helper.SubcommandDescription(cfg.WebDAV.Service.Name),
Category: "services",
Before: func(c *cli.Context) error {
configlog.LogError(parser.ParseConfig(cfg, true))
configlog.Error(parser.ParseConfig(cfg, true))
cfg.WebDAV.Commons = cfg.Commons
return nil
},

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -29,7 +29,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -28,7 +28,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -23,7 +23,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -30,7 +30,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -29,7 +29,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -29,7 +29,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -29,7 +29,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -28,7 +28,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -24,7 +24,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(ctx *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -24,7 +24,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -30,7 +30,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -28,7 +28,7 @@ func ResetPassword(cfg *config.Config) *cli.Command {
Usage: "Reset admin password",
Category: "password reset",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -30,7 +30,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -36,7 +36,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
configlog.LogReturnFatal(parser.ParseConfig(cfg))
configlog.ReturnFatal(parser.ParseConfig(cfg))
if cfg.IDP.EncryptionSecretFile != "" {
if err := ensureEncryptionSecretExists(cfg.IDP.EncryptionSecretFile); err != nil {

View File

@@ -21,7 +21,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -22,7 +22,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -23,7 +23,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -25,7 +25,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -41,7 +41,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -24,7 +24,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -17,7 +17,7 @@ func Health(cfg *config.Config) *cli.Command {
Name: "health",
Usage: "Check health status",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -25,7 +25,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -30,7 +30,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -29,7 +29,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -29,7 +29,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -29,7 +29,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -29,7 +29,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -36,7 +36,7 @@ func ListUploads(cfg *config.Config) *cli.Command {
Name: "list",
Usage: "Print a list of all incomplete uploads",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
f, ok := registry.NewFuncs[cfg.Driver]
@@ -77,7 +77,7 @@ func PurgeExpiredUploads(cfg *config.Config) *cli.Command {
Name: "clean",
Usage: "Clean up leftovers from expired uploads",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
f, ok := registry.NewFuncs[cfg.Driver]

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -25,7 +25,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -25,7 +25,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -30,7 +30,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -25,7 +25,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -18,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
Usage: "check health status",
Category: "info",
Before: func(c *cli.Context) error {
return configlog.LogReturnError(parser.ParseConfig(cfg))
return configlog.ReturnError(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)

View File

@@ -24,7 +24,7 @@ func Server(cfg *config.Config) *cli.Command {
Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return configlog.LogReturnFatal(parser.ParseConfig(cfg))
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)