Move logrus wrapper to ocis-pkg

To make it more widely usable
This commit is contained in:
Ralf Haferkamp
2022-02-16 13:17:28 +01:00
parent f612ca788e
commit a3aad659f8
2 changed files with 3 additions and 4 deletions

View File

@@ -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 {

View File

@@ -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()))