pass around the correct logger to the services

Also did some minor refactoring to make the code similar to the other
services.

go.mod

@@ -25,7 +25,6 @@ require (
 	github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/restic/calens v0.2.0
-	github.com/rs/zerolog v1.19.0
 	github.com/spf13/viper v1.7.0
 	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
 	github.com/tredoe/osutil v1.0.5

pkg/command/root.go

@@ -23,14 +23,16 @@ var (
 
 // Execute is the entry point for the ocis-accounts command.
 func Execute() error {
-	rootCfg := config.New()
+	cfg := config.New()
 	app := &cli.App{
-		Name:    "ocis-accounts",
-		Version: version.String,
-		Usage:   "Example service for Reva/oCIS",
-		Flags:   flagset.RootWithConfig(rootCfg),
+		Name:     "ocis-accounts",
+		Version:  version.String,
+		Usage:    "Example service for Reva/oCIS",
+		Compiled: version.Compiled(),
+		Flags:    flagset.RootWithConfig(cfg),
 		Before: func(c *cli.Context) error {
-			logger := NewLogger(config.New())
+			err := ParseConfig(c, cfg)
+			logger := NewLogger(cfg)
 			for _, v := range defaultConfigPaths {
 				// location is the user's home
 				if v[0] == '$' || v[0] == '~' {
@@ -46,7 +48,7 @@ func Execute() error {
 					}
 				}
 			}
-			return nil
+			return err
 		},
 
 		Authors: []*cli.Author{
@@ -57,7 +59,7 @@ func Execute() error {
 		},
 
 		Commands: []*cli.Command{
-			Server(rootCfg),
+			Server(cfg),
 		},
 	}
 

pkg/command/server.go

@@ -11,11 +11,6 @@ import (
 	"github.com/owncloud/ocis-accounts/pkg/config"
 	"github.com/owncloud/ocis-accounts/pkg/server/grpc"
 	svc "github.com/owncloud/ocis-accounts/pkg/service/v0"
-	oclog "github.com/owncloud/ocis-pkg/v2/log"
-)
-
-var (
-	logger oclog.Logger
 )
 
 // Server is the entry point for the server command.
@@ -26,15 +21,10 @@ func Server(cfg *config.Config) *cli.Command {
 		Description: "uses an LDAP server as the storage backend",
 		Flags:       flagset.ServerWithConfig(cfg),
 		Before: func(c *cli.Context) error {
-			logger = oclog.NewLogger(
-				oclog.Name(cfg.Server.Name),
-				oclog.Level("info"),
-				oclog.Color(true),
-				oclog.Pretty(true),
-			)
 			return ParseConfig(c, cfg)
 		},
 		Action: func(c *cli.Context) error {
+			logger := NewLogger(cfg)
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
 
@@ -46,6 +36,7 @@ func Server(cfg *config.Config) *cli.Command {
 				grpc.Name(cfg.Server.Name),
 				grpc.Namespace(cfg.Server.Namespace),
 				grpc.Address(cfg.Server.Address),
+				grpc.Flags(flagset.RootWithConfig(config.New())),
 			)
 
 			gr.Add(func() error {

pkg/server/grpc/option.go

@@ -3,6 +3,7 @@ package grpc
 import (
 	"context"
 
+	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-accounts/pkg/config"
 	"github.com/owncloud/ocis-pkg/v2/log"
 )
@@ -18,6 +19,7 @@ type Options struct {
 	Context   context.Context
 	Config    *config.Config
 	Namespace string
+	Flags     []cli.Flag
 }
 
 // newOptions initializes the available default options.
@@ -72,3 +74,10 @@ func Namespace(val string) Option {
 		o.Namespace = val
 	}
 }
+
+// Flags provides a function to set the flags option.
+func Flags(val []cli.Flag) Option {
+	return func(o *Options) {
+		o.Flags = append(o.Flags, val...)
+	}
+}

pkg/server/grpc/server.go

@@ -16,12 +16,13 @@ func NewService(opts ...Option) grpc.Service {
 		grpc.Address(options.Address),
 		grpc.Namespace(options.Namespace),
 		grpc.Logger(options.Logger),
+		grpc.Flags(options.Flags...),
 	)
 
 	var hdlr *svc.Service
 	var err error
 
-	if hdlr, err = svc.New(options.Config); err != nil {
+	if hdlr, err = svc.New(svc.Logger(options.Logger), svc.Config(options.Config)); err != nil {
 		options.Logger.Fatal().Err(err).Msg("could not initialize service handler")
 	}
 	if err = proto.RegisterAccountsServiceHandler(service.Server(), hdlr); err != nil {

pkg/service/v0/option.go

@@ -0,0 +1,39 @@
+package service
+
+import (
+	"github.com/owncloud/ocis-accounts/pkg/config"
+	"github.com/owncloud/ocis-pkg/v2/log"
+)
+
+// Option defines a single option function.
+type Option func(o *Options)
+
+// Options defines the available options for this package.
+type Options struct {
+	Logger log.Logger
+	Config *config.Config
+}
+
+func newOptions(opts ...Option) Options {
+	opt := Options{}
+
+	for _, o := range opts {
+		o(&opt)
+	}
+
+	return opt
+}
+
+// Logger provides a function to set the logger option.
+func Logger(val log.Logger) Option {
+	return func(o *Options) {
+		o.Logger = val
+	}
+}
+
+// Config provides a function to set the config option.
+func Config(val *config.Config) Option {
+	return func(o *Options) {
+		o.Config = val
+	}
+}