refactor NewLogger away to ocis-pkg

This commit is contained in:
A.Unger
2021-11-08 19:38:40 +01:00
parent 9d0809bd81
commit e7f9fb3bcb
5 changed files with 20 additions and 18 deletions
-12
View File
@@ -8,7 +8,6 @@ import (
"github.com/owncloud/ocis/accounts/pkg/config"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
@@ -57,17 +56,6 @@ func Execute(cfg *config.Config) error {
return app.Run(os.Args)
}
// NewLogger initializes a service-specific logger instance.
func NewLogger(cfg *config.Config) log.Logger {
return log.NewLogger(
log.Name("accounts"),
log.Level(cfg.Log.Level),
log.Pretty(cfg.Log.Pretty),
log.Color(cfg.Log.Color),
log.File(cfg.Log.File),
)
}
// ParseConfig loads accounts configuration from known paths.
func ParseConfig(c *cli.Context, cfg *config.Config) error {
conf, err := ociscfg.BindSourcesToStructs("accounts", cfg)
+3 -1
View File
@@ -4,6 +4,8 @@ import (
"context"
"strings"
"github.com/owncloud/ocis/ocis-pkg/log"
gofig "github.com/gookit/config/v2"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
@@ -55,7 +57,7 @@ func Server(cfg *config.Config) *cli.Command {
return nil
},
Action: func(c *cli.Context) error {
logger := NewLogger(cfg)
logger := log.LoggerFromConfig("accounts", cfg.Log)
err := tracing.Configure(cfg)
if err != nil {
return err