summaryrefslogtreecommitdiff
path: root/internal/log/log.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2021-12-12 18:00:20 +0100
committerLibravatar GitHub <noreply@github.com>2021-12-12 18:00:20 +0100
commitc111b239f7d102ac24a79fbef420af46dfec66f9 (patch)
tree813f5c4501a6e5048fb2922e099ce92d35b33b14 /internal/log/log.go
parentadd systemd service example to packaging (#342) (diff)
downloadgotosocial-c111b239f7d102ac24a79fbef420af46dfec66f9.tar.xz
Add optional syslog logrus hook (#343)
* add optional syslog logrus hook * document syslog
Diffstat (limited to 'internal/log/log.go')
-rw-r--r--internal/log/log.go53
1 files changed, 41 insertions, 12 deletions
diff --git a/internal/log/log.go b/internal/log/log.go
index b06146368..59c994035 100644
--- a/internal/log/log.go
+++ b/internal/log/log.go
@@ -22,31 +22,60 @@ import (
"bytes"
"os"
+ "log/syslog"
+
"github.com/sirupsen/logrus"
+ lSyslog "github.com/sirupsen/logrus/hooks/syslog"
+ "github.com/spf13/viper"
+ "github.com/superseriousbusiness/gotosocial/internal/config"
)
-// Initialize initializes the global Logrus logger to the specified level
+// Initialize initializes the global Logrus logger, reading the desired
+// log level from the viper store, or using a default if the level
+// has not been set in viper.
+//
// It also sets the output to log.outputSplitter,
// so you get error logs on stderr and normal logs on stdout.
-func Initialize(level string) error {
+//
+// If syslog settings are also in viper, then Syslog will be initialized as well.
+func Initialize() error {
logrus.SetOutput(&outputSplitter{})
- logLevel, err := logrus.ParseLevel(level)
- if err != nil {
- return err
- }
- logrus.SetLevel(logLevel)
-
- if logLevel == logrus.TraceLevel {
- logrus.SetReportCaller(true)
- }
-
logrus.SetFormatter(&logrus.TextFormatter{
DisableColors: true,
DisableQuote: true,
FullTimestamp: true,
})
+ keys := config.Keys
+
+ // check if a desired log level has been set
+ logLevel := viper.GetString(keys.LogLevel)
+ if logLevel != "" {
+ level, err := logrus.ParseLevel(logLevel)
+ if err != nil {
+ return err
+ }
+ logrus.SetLevel(level)
+
+ if level == logrus.TraceLevel {
+ logrus.SetReportCaller(true)
+ }
+ }
+
+ // check if syslog has been enabled, and configure it if so
+ if syslogEnabled := viper.GetBool(keys.SyslogEnabled); syslogEnabled {
+ protocol := viper.GetString(keys.SyslogProtocol)
+ address := viper.GetString(keys.SyslogAddress)
+
+ hook, err := lSyslog.NewSyslogHook(protocol, address, syslog.LOG_INFO, "")
+ if err != nil {
+ return err
+ }
+
+ logrus.AddHook(hook)
+ }
+
return nil
}