Use logrusr instead of zap.

logrusr is a open source convertor, which can convert logrus logger into logr.
By using logrusr, velero can use exsiting formatted logrus logger, other than introducing zap as a new logger.

Signed-off-by: Xun Jiang <jxun@vmware.com>
This commit is contained in:
Xun Jiang
2021-11-17 18:10:37 +08:00
parent 8eee35a62e
commit 2c240c2830
3 changed files with 6 additions and 2 deletions
+2 -2
View File
@@ -27,6 +27,7 @@ import (
"strings"
"time"
"github.com/bombsimon/logrusr"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/sirupsen/logrus"
@@ -73,7 +74,6 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
"github.com/vmware-tanzu/velero/internal/storage"
@@ -303,7 +303,7 @@ func newServer(f client.Factory, config serverConfig, logger *logrus.Logger) (*s
velerov1api.AddToScheme(scheme)
corev1api.AddToScheme(scheme)
ctrl.SetLogger(zap.New())
ctrl.SetLogger(logrusr.NewLogger(logger))
mgr, err := ctrl.NewManager(clientConfig, ctrl.Options{
Scheme: scheme,