From 083099a9575f8b2fac22c1d4a51a9dd0e2201243 Mon Sep 17 00:00:00 2001 From: "R. Aidan Campbell" Date: Mon, 11 Oct 2021 05:37:33 -0700 Subject: reference global logrus (#274) * reference logrus' global logger instead of passing and storing a logger reference everywhere * always directly use global logrus logger instead of referencing an instance * test suites should also directly use the global logrus logger * rename gin logging function to clarify that it's middleware * correct comments which erroneously referenced removed logger parameter * setting log level for tests now uses logrus' exported type instead of the string value, to guarantee error isn't possible --- cmd/gotosocial/runaction.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/gotosocial/runaction.go b/cmd/gotosocial/runaction.go index fc548d85f..c8af9ddbe 100644 --- a/cmd/gotosocial/runaction.go +++ b/cmd/gotosocial/runaction.go @@ -41,11 +41,11 @@ func runAction(c *cli.Context, a cliactions.GTSAction) error { return fmt.Errorf("error parsing config: %s", err) } - // create a logger with the log level, formatting, and output splitter already set - log, err := log.New(conf.LogLevel) + // initialize the global logger to the log level, with formatting and output splitter already set + err = log.Initialize(conf.LogLevel) if err != nil { return fmt.Errorf("error creating logger: %s", err) } - return a(c.Context, conf, log) + return a(c.Context, conf) } -- cgit v1.3