diff --git a/pkg/command/server.go b/pkg/command/server.go index a3d09e71d..8edf122a2 100644 --- a/pkg/command/server.go +++ b/pkg/command/server.go @@ -9,6 +9,7 @@ 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" ) // Server is the entry point for the server command. @@ -62,9 +63,13 @@ func Server(cfg *config.Config) *cli.Command { 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.Context(ctx), grpc.Config(cfg), grpc.Name(cfg.Server.Name), diff --git a/pkg/micro/grpc/grpc.go b/pkg/micro/grpc/grpc.go index f4be23ed4..9bff7f94b 100644 --- a/pkg/micro/grpc/grpc.go +++ b/pkg/micro/grpc/grpc.go @@ -15,6 +15,7 @@ func NewService(opts ...Option) grpc.Service { grpc.Context(options.Context), grpc.Address(options.Address), grpc.Namespace(options.Namespace), + grpc.Logger(options.Logger), ) hdlr := svc.New(options.Config) diff --git a/pkg/micro/grpc/options.go b/pkg/micro/grpc/options.go index 1e92d61ba..132cf498c 100644 --- a/pkg/micro/grpc/options.go +++ b/pkg/micro/grpc/options.go @@ -4,7 +4,7 @@ import ( "context" "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-pkg/log" + "github.com/owncloud/ocis-pkg/v2/log" ) // Option defines a single option function. diff --git a/pkg/service/v0/service.go b/pkg/service/v0/service.go index e4db11353..b927de58e 100644 --- a/pkg/service/v0/service.go +++ b/pkg/service/v0/service.go @@ -7,7 +7,7 @@ import ( "github.com/owncloud/ocis-accounts/pkg/account" "github.com/owncloud/ocis-accounts/pkg/config" "github.com/owncloud/ocis-accounts/pkg/proto/v0" - olog "github.com/owncloud/ocis-pkg/log" + olog "github.com/owncloud/ocis-pkg/v2/log" ) // New returns a new instance of Service diff --git a/pkg/store/filesystem/store.go b/pkg/store/filesystem/store.go index 40428e170..21bddd350 100644 --- a/pkg/store/filesystem/store.go +++ b/pkg/store/filesystem/store.go @@ -13,7 +13,7 @@ import ( "github.com/owncloud/ocis-accounts/pkg/account" "github.com/owncloud/ocis-accounts/pkg/config" "github.com/owncloud/ocis-accounts/pkg/proto/v0" - olog "github.com/owncloud/ocis-pkg/log" + olog "github.com/owncloud/ocis-pkg/v2/log" ) var (