diff options
author | 2022-07-19 09:47:55 +0100 | |
---|---|---|
committer | 2022-07-19 10:47:55 +0200 | |
commit | 098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3 (patch) | |
tree | 17036ad9db68c3080e1e91279c8bce9f9ea6e5c3 /internal/media/manager.go | |
parent | [bugfix] Markdown format fixes (#718) (diff) | |
download | gotosocial-098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3.tar.xz |
[chore] use our own logging implementation (#716)
* first commit
Signed-off-by: kim <grufwub@gmail.com>
* replace logging with our own log library
Signed-off-by: kim <grufwub@gmail.com>
* fix imports
Signed-off-by: kim <grufwub@gmail.com>
* fix log imports
Signed-off-by: kim <grufwub@gmail.com>
* add license text
Signed-off-by: kim <grufwub@gmail.com>
* fix package import cycle between config and log package
Signed-off-by: kim <grufwub@gmail.com>
* fix empty kv.Fields{} being passed to WithFields()
Signed-off-by: kim <grufwub@gmail.com>
* fix uses of log.WithFields() with whitespace issues and empty slices
Signed-off-by: kim <grufwub@gmail.com>
* *linter related grumbling*
Signed-off-by: kim <grufwub@gmail.com>
* gofmt the codebase! also fix more log.WithFields() formatting issues
Signed-off-by: kim <grufwub@gmail.com>
* update testrig code to match new changes
Signed-off-by: kim <grufwub@gmail.com>
* fix error wrapping in non fmt.Errorf function
Signed-off-by: kim <grufwub@gmail.com>
* add benchmarking of log.Caller() vs non-cached
Signed-off-by: kim <grufwub@gmail.com>
* fix syslog tests, add standard build tags to test runner to ensure consistency
Signed-off-by: kim <grufwub@gmail.com>
* make syslog tests more robust
Signed-off-by: kim <grufwub@gmail.com>
* fix caller depth arithmatic (is that how you spell it?)
Signed-off-by: kim <grufwub@gmail.com>
* update to use unkeyed fields in kv.Field{} instances
Signed-off-by: kim <grufwub@gmail.com>
* update go-kv library
Signed-off-by: kim <grufwub@gmail.com>
* update libraries list
Signed-off-by: kim <grufwub@gmail.com>
* fuck you linter get nerfed
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com>
Diffstat (limited to 'internal/media/manager.go')
-rw-r--r-- | internal/media/manager.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/internal/media/manager.go b/internal/media/manager.go index b14288324..828aa033b 100644 --- a/internal/media/manager.go +++ b/internal/media/manager.go @@ -24,10 +24,10 @@ import ( "time" "github.com/robfig/cron/v3" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/concurrency" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/storage" ) @@ -210,10 +210,10 @@ func scheduleCleanupJobs(m *manager) error { begin := time.Now() pruned, err := m.PruneAllMeta(pruneCtx) if err != nil { - logrus.Errorf("media manager: error pruning meta: %s", err) + log.Errorf("media manager: error pruning meta: %s", err) return } - logrus.Infof("media manager: pruned %d meta entries in %s", pruned, time.Since(begin)) + log.Infof("media manager: pruned %d meta entries in %s", pruned, time.Since(begin)) }); err != nil { pruneCancel() return fmt.Errorf("error starting media manager meta cleanup job: %s", err) @@ -223,10 +223,10 @@ func scheduleCleanupJobs(m *manager) error { begin := time.Now() pruned, err := m.PruneUnusedLocalAttachments(pruneCtx) if err != nil { - logrus.Errorf("media manager: error pruning unused local attachments: %s", err) + log.Errorf("media manager: error pruning unused local attachments: %s", err) return } - logrus.Infof("media manager: pruned %d unused local attachments in %s", pruned, time.Since(begin)) + log.Infof("media manager: pruned %d unused local attachments in %s", pruned, time.Since(begin)) }); err != nil { pruneCancel() return fmt.Errorf("error starting media manager unused local attachments cleanup job: %s", err) @@ -238,10 +238,10 @@ func scheduleCleanupJobs(m *manager) error { begin := time.Now() pruned, err := m.PruneAllRemote(pruneCtx, mediaRemoteCacheDays) if err != nil { - logrus.Errorf("media manager: error pruning remote cache: %s", err) + log.Errorf("media manager: error pruning remote cache: %s", err) return } - logrus.Infof("media manager: pruned %d remote cache entries in %s", pruned, time.Since(begin)) + log.Infof("media manager: pruned %d remote cache entries in %s", pruned, time.Since(begin)) }); err != nil { pruneCancel() return fmt.Errorf("error starting media manager remote cache cleanup job: %s", err) @@ -254,9 +254,9 @@ func scheduleCleanupJobs(m *manager) error { select { case <-cronCtx.Done(): - logrus.Infof("media manager: cron finished jobs and stopped gracefully") + log.Infof("media manager: cron finished jobs and stopped gracefully") case <-time.After(1 * time.Minute): - logrus.Infof("media manager: cron didn't stop after 60 seconds, will force close jobs") + log.Infof("media manager: cron didn't stop after 60 seconds, will force close jobs") break } |