diff --git a/api/dataservices/edgeupdateschedule/edgeupdateschedule.go b/api/dataservices/edgeupdateschedule/edgeupdateschedule.go index 2430bab11..3044d6f09 100644 --- a/api/dataservices/edgeupdateschedule/edgeupdateschedule.go +++ b/api/dataservices/edgeupdateschedule/edgeupdateschedule.go @@ -4,10 +4,11 @@ import ( "fmt" "sync" - "github.com/pkg/errors" portainer "github.com/portainer/portainer/api" "github.com/portainer/portainer/api/edgetypes" - "github.com/sirupsen/logrus" + + "github.com/pkg/errors" + "github.com/rs/zerolog/log" ) const ( @@ -84,7 +85,7 @@ func (service *Service) List() ([]edgetypes.UpdateSchedule, error) { func(obj interface{}) (interface{}, error) { item, ok := obj.(*edgetypes.UpdateSchedule) if !ok { - logrus.WithField("obj", obj).Errorf("Failed to convert to EdgeUpdateSchedule object") + log.Debug().Str("obj", fmt.Sprintf("%#v", obj)).Msg("failed to convert to EdgeUpdateSchedule object") return nil, fmt.Errorf("Failed to convert to EdgeUpdateSchedule object: %s", obj) } list = append(list, *item) diff --git a/api/dataservices/snapshot/snapshot.go b/api/dataservices/snapshot/snapshot.go index ab5909d26..0a2f23ddc 100644 --- a/api/dataservices/snapshot/snapshot.go +++ b/api/dataservices/snapshot/snapshot.go @@ -4,7 +4,8 @@ import ( "fmt" portainer "github.com/portainer/portainer/api" - "github.com/sirupsen/logrus" + + "github.com/rs/zerolog/log" ) const ( @@ -51,7 +52,7 @@ func (service *Service) Snapshots() ([]portainer.Snapshot, error) { func(obj interface{}) (interface{}, error) { snapshot, ok := obj.(*portainer.Snapshot) if !ok { - logrus.WithField("obj", obj).Errorf("Failed to convert to Snapshot object") + log.Debug().Str("obj", fmt.Sprintf("%#v", obj)).Msg("failed to convert to Snapshot object") return nil, fmt.Errorf("failed to convert to Snapshot object: %s", obj) } snapshots = append(snapshots, *snapshot) diff --git a/api/go.mod b/api/go.mod index 0e38ab706..60d1da09d 100644 --- a/api/go.mod +++ b/api/go.mod @@ -39,7 +39,6 @@ require ( github.com/rkl-/digest v0.0.0-20180419075440-8316caa4a777 github.com/robfig/cron/v3 v3.0.1 github.com/rs/zerolog v1.28.0 - github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.7.0 github.com/viney-shih/go-lock v1.1.1 go.etcd.io/bbolt v1.3.6 @@ -105,6 +104,7 @@ require ( github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sergi/go-diff v1.1.0 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce // indirect github.com/x448/float16 v0.8.4 // indirect