glauth

glauth/pkg/command/root.go

@@ -52,7 +52,7 @@ func Execute(cfg *config.Config) error {
 
 // NewLogger initializes a service-specific logger instance.
 func NewLogger(cfg *config.Config) log.Logger {
-	return oclog.LoggerFromConfig("glauth", cfg.Log)
+	return oclog.LoggerFromConfig("glauth", *cfg.Log)
 }
 
 // ParseConfig loads glauth configuration from known paths.
@@ -62,8 +62,20 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 		return err
 	}
 
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Log = &shared.Log{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Log == nil && cfg.Commons == nil {
+		cfg.Log = &shared.Log{}
+	}
+
 	// load all env variables relevant to the config in the current context.
-	conf.LoadOSEnv(config.GetEnv(), false)
+	conf.LoadOSEnv(config.GetEnv(cfg), false)
 	bindings := config.StructMappings(cfg)
 	return ociscfg.BindEnv(conf, bindings)
 }
@@ -75,9 +87,7 @@ type SutureService struct {
 
 // NewSutureService creates a new glauth.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	if (cfg.GLAuth.Log == shared.Log{}) {
-		cfg.GLAuth.Log = cfg.Log
-	}
+	cfg.GLAuth.Commons = cfg.Commons
 	return SutureService{
 		cfg: cfg.GLAuth,
 	}

glauth/pkg/command/server.go

@@ -4,10 +4,6 @@ import (
 	"context"
 	"strings"
 
-	gofig "github.com/gookit/config/v2"
-	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/shared"
-
 	glauthcfg "github.com/glauth/glauth/v2/pkg/config"
 	"github.com/oklog/run"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
@@ -28,9 +24,6 @@ func Server(cfg *config.Config) *cli.Command {
 		Name:  "server",
 		Usage: "Start integrated server",
 		Before: func(ctx *cli.Context) error {
-			// remember shared logging info to prevent empty overwrites
-			inLog := cfg.Log
-
 			if cfg.HTTP.Root != "/" {
 				cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
 			}
@@ -39,19 +32,6 @@ func Server(cfg *config.Config) *cli.Command {
 				return err
 			}
 
-			if (cfg.Log == shared.Log{}) && (inLog != shared.Log{}) {
-				// set the default to the parent config
-				cfg.Log = inLog
-
-				// and parse the environment
-				conf := &gofig.Config{}
-				conf.LoadOSEnv(config.GetEnv(), false)
-				bindings := config.StructMappings(cfg)
-				if err := ociscfg.BindEnv(conf, bindings); err != nil {
-					return err
-				}
-			}
-
 			return nil
 		},
 		Action: func(c *cli.Context) error {