propper logging

This commit is contained in:
A.Unger
2020-02-12 13:30:20 +01:00
parent 8f43899476
commit ba8e60a714
5 changed files with 9 additions and 3 deletions
+5
View File
@@ -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),
+1
View File
@@ -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)
+1 -1
View File
@@ -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.
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 (