From a3aad659f89c26cd60bd23ed1632f7eaed4cf1c3 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 16 Feb 2022 13:17:28 +0100 Subject: [PATCH] Move logrus wrapper to ocis-pkg To make it more widely usable --- idp/pkg/service/v0/service.go | 3 +-- {idp/pkg/logging => ocis-pkg/log}/logrus_wrapper.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) rename {idp/pkg/logging => ocis-pkg/log}/logrus_wrapper.go (96%) diff --git a/idp/pkg/service/v0/service.go b/idp/pkg/service/v0/service.go index 24fb3132d3..cf486f1621 100644 --- a/idp/pkg/service/v0/service.go +++ b/idp/pkg/service/v0/service.go @@ -21,7 +21,6 @@ import ( "github.com/libregraph/lico/server" "github.com/owncloud/ocis/idp/pkg/assets" "github.com/owncloud/ocis/idp/pkg/config" - "github.com/owncloud/ocis/idp/pkg/logging" "github.com/owncloud/ocis/idp/pkg/middleware" "github.com/owncloud/ocis/ocis-pkg/log" "stash.kopano.io/kgol/rndm" @@ -59,7 +58,7 @@ func NewService(opts ...Option) Service { idpSettings := bootstrap.Settings(options.Config.IDP) bs, err := bootstrap.Boot(ctx, &idpSettings, &licoconfig.Config{ - Logger: logging.Wrap(logger), + Logger: log.LogrusWrap(logger), }) if err != nil { diff --git a/idp/pkg/logging/logrus_wrapper.go b/ocis-pkg/log/logrus_wrapper.go similarity index 96% rename from idp/pkg/logging/logrus_wrapper.go rename to ocis-pkg/log/logrus_wrapper.go index 38e302005d..e4c29240d9 100644 --- a/idp/pkg/logging/logrus_wrapper.go +++ b/ocis-pkg/log/logrus_wrapper.go @@ -1,4 +1,4 @@ -package logging +package log import ( "io/ioutil" @@ -26,7 +26,7 @@ type LogrusWrapper struct { // Wrap return a logrus logger which internally logs to /dev/null. Messages are passed to the // underlying zerolog via hooks. -func Wrap(zr zerolog.Logger) *logrus.Logger { +func LogrusWrap(zr zerolog.Logger) *logrus.Logger { lr := logrus.New() lr.SetOutput(ioutil.Discard) lr.SetLevel(logrusLevel(zr.GetLevel()))