diff --git a/api/datastore/migrator/migrate_dbversion70.go b/api/datastore/migrator/migrate_dbversion70.go index 28ceb6f5a..884498cd9 100644 --- a/api/datastore/migrator/migrate_dbversion70.go +++ b/api/datastore/migrator/migrate_dbversion70.go @@ -2,6 +2,7 @@ package migrator import ( portainer "github.com/portainer/portainer/api" + "github.com/rs/zerolog/log" ) func (m *Migrator) migrateDBVersionToDB70() error { @@ -13,7 +14,7 @@ func (m *Migrator) migrateDBVersionToDB70() error { for _, endpoint := range endpoints { // copy snapshots to new object - migrateLog.Info("- moving snapshots from endpoint to new object") + log.Info().Msg("moving snapshots from endpoint to new object") snapshot := portainer.Snapshot{EndpointID: endpoint.ID} if len(endpoint.Snapshots) > 0 { @@ -31,7 +32,7 @@ func (m *Migrator) migrateDBVersionToDB70() error { } // set to nil old fields - migrateLog.Info("- deleting snapshot from endpoint") + log.Info().Msg("deleting snapshot from endpoint") endpoint.Snapshots = []portainer.DockerSnapshot{} endpoint.Kubernetes.Snapshots = []portainer.KubernetesSnapshot{} diff --git a/api/datastore/services.go b/api/datastore/services.go index d3ed2ee0c..4a52a4b80 100644 --- a/api/datastore/services.go +++ b/api/datastore/services.go @@ -518,7 +518,7 @@ func (store *Store) Export(filename string) (err error) { if snapshot, err := store.Snapshot().Snapshots(); err != nil { if !store.IsErrObjectNotFound(err) { - logrus.WithError(err).Errorf("Exporting Snapshots") + log.Err(err).Msg("Exporting Snapshots") } } else { backup.Snapshot = snapshot diff --git a/api/go.mod b/api/go.mod index 0bbd7d270..0e38ab706 100644 --- a/api/go.mod +++ b/api/go.mod @@ -38,6 +38,7 @@ require ( github.com/portainer/libhttp v0.0.0-20220916153711-5d61e12f4b0a 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 @@ -103,7 +104,6 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rs/zerolog v1.28.0 // indirect github.com/sergi/go-diff v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce // indirect diff --git a/api/go.sum b/api/go.sum index 2b26fda2a..650360013 100644 --- a/api/go.sum +++ b/api/go.sum @@ -365,8 +365,6 @@ github.com/portainer/libcrypto v0.0.0-20220506221303-1f4fb3b30f9a h1:B0z3skIMT+O github.com/portainer/libcrypto v0.0.0-20220506221303-1f4fb3b30f9a/go.mod h1:n54EEIq+MM0NNtqLeCby8ljL+l275VpolXO0ibHegLE= github.com/portainer/libhelm v0.0.0-20210929000907-825e93d62108 h1:5e8KAnDa2G3cEHK7aV/ue8lOaoQwBZUzoALslwWkR04= github.com/portainer/libhelm v0.0.0-20210929000907-825e93d62108/go.mod h1:YvYAk7krKTzB+rFwDr0jQ3sQu2BtiXK1AR0sZH7nhJA= -github.com/portainer/libhttp v0.0.0-20211208103139-07a5f798eb3f h1:GMIjRVV2LADpJprPG2+8MdRH6XvrFgC7wHm7dFUdOpc= -github.com/portainer/libhttp v0.0.0-20211208103139-07a5f798eb3f/go.mod h1:nyQA6IahOruIvENCcBk54aaUvV2WHFdXkvBjIutg+SY= github.com/portainer/libhttp v0.0.0-20220916153711-5d61e12f4b0a h1:BJ5V4EDNhg3ImYbmXnGS8vrMhq6rzsEneIXyJh0g4dc= github.com/portainer/libhttp v0.0.0-20220916153711-5d61e12f4b0a/go.mod h1:ckuHnoLA5kLuE5WkvPBXmrw63LUMdSH4aX71QRi9y10= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=