Added std type to logging config. #2060
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,8 +17,10 @@ | |
| package internal | ||
|
|
||
| import ( | ||
| "io/ioutil" | ||
| "log/syslog" | ||
|
|
||
| "github.com/MFAshby/stdemuxerhook" | ||
| "github.com/matrix-org/dendrite/setup/config" | ||
| "github.com/sirupsen/logrus" | ||
| lSyslog "github.com/sirupsen/logrus/hooks/syslog" | ||
|
|
@@ -29,6 +31,17 @@ import ( | |
| // so we just exit with the error | ||
| func SetupHookLogging(hooks []config.LogrusHook, componentName string) { | ||
| logrus.SetReportCaller(true) | ||
| logrus.SetFormatter(&utcFormatter{ | ||
| &logrus.TextFormatter{ | ||
| TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00", | ||
| FullTimestamp: true, | ||
| DisableColors: false, | ||
| DisableTimestamp: false, | ||
| QuoteEmptyFields: true, | ||
| CallerPrettyfier: callerPrettyfier, | ||
| }, | ||
| }) | ||
| stdLogAdded := false | ||
| for _, hook := range hooks { | ||
| // Check we received a proper logging level | ||
| level, err := logrus.ParseLevel(hook.Level) | ||
|
|
@@ -49,10 +62,19 @@ func SetupHookLogging(hooks []config.LogrusHook, componentName string) { | |
| case "syslog": | ||
| checkSyslogHookParams(hook.Params) | ||
| setupSyslogHook(hook, level, componentName) | ||
| case "std": | ||
| setupStdLogHook(level) | ||
| stdLogAdded = true | ||
| default: | ||
| logrus.Fatalf("Unrecognised logging hook type: %s", hook.Type) | ||
| } | ||
| } | ||
| if !stdLogAdded { | ||
| logrus.Info("No std logger config found. Enabling at INFO level by default") | ||
|
There was a problem hiding this comment. I'm not really sure if we need to log this? It just seems like noise. There was a problem hiding this comment. Yep, I was pretty much just using it for a quick test. Could take it out. |
||
| setupStdLogHook(logrus.InfoLevel) | ||
| } | ||
| // Hooks are now configured for stdout/err, so throw away the default logger output | ||
| logrus.SetOutput(ioutil.Discard) | ||
|
There was a problem hiding this comment. I'm somewhat wondering whether something like There was a problem hiding this comment. I'm not sure: wouldn't this set the level for all loggers? There was a problem hiding this comment. I'm not sure to be honest. Just a thought / might be worth trying. There was a problem hiding this comment. It doesn't work, I'm afraid. Calling This explains why this code here is required: Line 41 in 61406a6 I think this is just a limitation of logrus. There was a problem hiding this comment. That's unfortunate. We'll just have to go with |
||
| } | ||
|
|
||
| func checkSyslogHookParams(params map[string]interface{}) { | ||
|
|
@@ -76,6 +98,10 @@ func checkSyslogHookParams(params map[string]interface{}) { | |
|
|
||
| } | ||
|
|
||
| func setupStdLogHook(level logrus.Level) { | ||
| logrus.AddHook(&logLevelHook{level, stdemuxerhook.New(logrus.StandardLogger())}) | ||
| } | ||
|
|
||
| func setupSyslogHook(hook config.LogrusHook, level logrus.Level, componentName string) { | ||
| syslogHook, err := lSyslog.NewSyslogHook(hook.Params["protocol"].(string), hook.Params["address"].(string), syslog.LOG_INFO, componentName) | ||
| if err == nil { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you move this back to
internal/log.goand undo the changes tosetup/base/base.go, I'm happy with this. :)