From d858fb3c77eb68fc1c739d2c8c6c6bf55a57608e Mon Sep 17 00:00:00 2001
From: "A.Unger" <zyxancf@gmail.com>
Date: Wed, 12 Feb 2020 14:11:25 +0100
Subject: [PATCH] better better logging

---
 pkg/command/server.go         | 15 ++++++++++-----
 pkg/store/filesystem/store.go |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkg/command/server.go b/pkg/command/server.go
index 8edf122a2..9c1ea3ee4 100644
--- a/pkg/command/server.go
+++ b/pkg/command/server.go
@@ -9,7 +9,11 @@ import (
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-accounts/pkg/config"
 	"github.com/owncloud/ocis-accounts/pkg/micro/grpc"
-	olog "github.com/owncloud/ocis-pkg/v2/log"
+	oclog "github.com/owncloud/ocis-pkg/v2/log"
+)
+
+var (
+	logger oclog.Logger
 )
 
 // Server is the entry point for the server command.
@@ -60,16 +64,17 @@ func Server(cfg *config.Config) *cli.Command {
 				Destination: &cfg.Server.Address,
 			},
 		},
+		Before: func(c *cli.Context) error {
+			logger = oclog.NewLogger(oclog.Name(cfg.Server.Name))
+			return nil
+		},
 		Action: func(c *cli.Context) error {
 			gr := run.Group{}
 			ctx, cancel := context.WithCancel(context.Background())
-			l := olog.NewLogger(
-				olog.Name(cfg.Server.Name),
-			)
 
 			defer cancel()
 			service := grpc.NewService(
-				grpc.Logger(l),
+				grpc.Logger(logger),
 				grpc.Context(ctx),
 				grpc.Config(cfg),
 				grpc.Name(cfg.Server.Name),
diff --git a/pkg/store/filesystem/store.go b/pkg/store/filesystem/store.go
index 21bddd350..14e6a2dfb 100644
--- a/pkg/store/filesystem/store.go
+++ b/pkg/store/filesystem/store.go
@@ -34,7 +34,7 @@ type Store struct {
 // New creates a new store
 func New(cfg *config.Config) account.Manager {
 	s := Store{
-		Logger: olog.NewLogger(olog.Name("ocis-accounts")),
+		Logger: olog.NewLogger(olog.Name(cfg.Server.Name)),
 	}
 
 	dest := filepath.Join(cfg.MountPath, StoreName)