From 098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Tue, 19 Jul 2022 09:47:55 +0100 Subject: [chore] use our own logging implementation (#716) * first commit Signed-off-by: kim * replace logging with our own log library Signed-off-by: kim * fix imports Signed-off-by: kim * fix log imports Signed-off-by: kim * add license text Signed-off-by: kim * fix package import cycle between config and log package Signed-off-by: kim * fix empty kv.Fields{} being passed to WithFields() Signed-off-by: kim * fix uses of log.WithFields() with whitespace issues and empty slices Signed-off-by: kim * *linter related grumbling* Signed-off-by: kim * gofmt the codebase! also fix more log.WithFields() formatting issues Signed-off-by: kim * update testrig code to match new changes Signed-off-by: kim * fix error wrapping in non fmt.Errorf function Signed-off-by: kim * add benchmarking of log.Caller() vs non-cached Signed-off-by: kim * fix syslog tests, add standard build tags to test runner to ensure consistency Signed-off-by: kim * make syslog tests more robust Signed-off-by: kim * fix caller depth arithmatic (is that how you spell it?) Signed-off-by: kim * update to use unkeyed fields in kv.Field{} instances Signed-off-by: kim * update go-kv library Signed-off-by: kim * update libraries list Signed-off-by: kim * fuck you linter get nerfed Signed-off-by: kim Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com> --- internal/media/util.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'internal/media/util.go') diff --git a/internal/media/util.go b/internal/media/util.go index 9d62619f5..aea2ad990 100644 --- a/internal/media/util.go +++ b/internal/media/util.go @@ -24,7 +24,7 @@ import ( "time" "github.com/h2non/filetype" - "github.com/sirupsen/logrus" + "github.com/superseriousbusiness/gotosocial/internal/log" ) // AllSupportedMIMETypes just returns all media @@ -117,17 +117,16 @@ func ParseMediaSize(s string) (Size, error) { } // logrusWrapper is just a util for passing the logrus logger into the cron logging system. -type logrusWrapper struct { -} +type logrusWrapper struct{} // Info logs routine messages about cron's operation. func (l *logrusWrapper) Info(msg string, keysAndValues ...interface{}) { - logrus.Info("media manager cron logger: ", msg, keysAndValues) + log.Info("media manager cron logger: ", msg, keysAndValues) } // Error logs an error condition. func (l *logrusWrapper) Error(err error, msg string, keysAndValues ...interface{}) { - logrus.Error("media manager cron logger: ", err, msg, keysAndValues) + log.Error("media manager cron logger: ", err, msg, keysAndValues) } func parseOlderThan(olderThanDays int) (time.Time, error) { -- cgit v1.2.3