diff options
author | 2022-07-19 09:47:55 +0100 | |
---|---|---|
committer | 2022-07-19 10:47:55 +0200 | |
commit | 098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3 (patch) | |
tree | 17036ad9db68c3080e1e91279c8bce9f9ea6e5c3 /cmd | |
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 'cmd')
-rw-r--r-- | cmd/gotosocial/action/server/server.go | 6 | ||||
-rw-r--r-- | cmd/gotosocial/action/testrig/testrig.go | 6 | ||||
-rw-r--r-- | cmd/gotosocial/common.go | 15 | ||||
-rw-r--r-- | cmd/gotosocial/main.go | 4 |
4 files changed, 21 insertions, 10 deletions
diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go index 35dc029c5..ee327c0c5 100644 --- a/cmd/gotosocial/action/server/server.go +++ b/cmd/gotosocial/action/server/server.go @@ -25,7 +25,6 @@ import ( "os/signal" "syscall" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/cmd/gotosocial/action" "github.com/superseriousbusiness/gotosocial/internal/api" "github.com/superseriousbusiness/gotosocial/internal/api/client/account" @@ -59,6 +58,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb" "github.com/superseriousbusiness/gotosocial/internal/gotosocial" "github.com/superseriousbusiness/gotosocial/internal/httpclient" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/media" "github.com/superseriousbusiness/gotosocial/internal/messages" "github.com/superseriousbusiness/gotosocial/internal/oauth" @@ -236,13 +236,13 @@ var Start action.GTSAction = func(ctx context.Context) error { sigs := make(chan os.Signal, 1) signal.Notify(sigs, os.Interrupt, syscall.SIGTERM) sig := <-sigs - logrus.Infof("received signal %s, shutting down", sig) + log.Infof("received signal %s, shutting down", sig) // close down all running services in order if err := gts.Stop(ctx); err != nil { return fmt.Errorf("error closing gotosocial service: %s", err) } - logrus.Info("done! exiting...") + log.Info("done! exiting...") return nil } diff --git a/cmd/gotosocial/action/testrig/testrig.go b/cmd/gotosocial/action/testrig/testrig.go index b5526dc32..739358f99 100644 --- a/cmd/gotosocial/action/testrig/testrig.go +++ b/cmd/gotosocial/action/testrig/testrig.go @@ -28,7 +28,6 @@ import ( "os/signal" "syscall" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/cmd/gotosocial/action" "github.com/superseriousbusiness/gotosocial/internal/api" "github.com/superseriousbusiness/gotosocial/internal/api/client/account" @@ -56,6 +55,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/api/security" "github.com/superseriousbusiness/gotosocial/internal/concurrency" "github.com/superseriousbusiness/gotosocial/internal/gotosocial" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/messages" "github.com/superseriousbusiness/gotosocial/internal/oidc" "github.com/superseriousbusiness/gotosocial/internal/storage" @@ -189,7 +189,7 @@ var Start action.GTSAction = func(ctx context.Context) error { sigs := make(chan os.Signal, 1) signal.Notify(sigs, os.Interrupt, syscall.SIGTERM) sig := <-sigs - logrus.Infof("received signal %s, shutting down", sig) + log.Infof("received signal %s, shutting down", sig) testrig.StandardDBTeardown(dbService) testrig.StandardStorageTeardown(storageBackend) @@ -199,6 +199,6 @@ var Start action.GTSAction = func(ctx context.Context) error { return fmt.Errorf("error closing gotosocial service: %s", err) } - logrus.Info("done! exiting...") + log.Info("done! exiting...") return nil } diff --git a/cmd/gotosocial/common.go b/cmd/gotosocial/common.go index 43e2f16ad..4ebdc5485 100644 --- a/cmd/gotosocial/common.go +++ b/cmd/gotosocial/common.go @@ -64,8 +64,19 @@ func preRun(a preRunArgs) error { // The idea here is to take a GTSAction and run it with the given // context, after initializing any last-minute things like loggers etc. func run(ctx context.Context, action action.GTSAction) error { - if err := log.Initialize(); err != nil { - return fmt.Errorf("error initializing log: %s", err) + // Set the global log level from configuration + if err := log.ParseLevel(config.GetLogLevel()); err != nil { + return fmt.Errorf("error parsing log level: %w", err) + } + + if config.GetSyslogEnabled() { + // Enable logging to syslog + if err := log.EnableSyslog( + config.GetSyslogProtocol(), + config.GetSyslogAddress(), + ); err != nil { + return fmt.Errorf("error enabling syslogging: %w", err) + } } return action(ctx) diff --git a/cmd/gotosocial/main.go b/cmd/gotosocial/main.go index 1b815f6b7..6edede6d5 100644 --- a/cmd/gotosocial/main.go +++ b/cmd/gotosocial/main.go @@ -19,10 +19,10 @@ package main import ( + "log" "runtime/debug" "strings" - "github.com/sirupsen/logrus" "github.com/spf13/cobra" _ "github.com/superseriousbusiness/gotosocial/docs" @@ -66,7 +66,7 @@ func main() { // run if err := rootCmd.Execute(); err != nil { - logrus.Fatalf("error executing command: %s", err) + log.Fatalf("error executing command: %s", err) } } |