engineering/sshpiper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the log formatter configurable (#371)

Browse source 
* Make the log formatter configurable

The change lets us configure the deamon and the plugins to output logs
in the JSON format, which is easier to parse/filter by log processing
tools.

* Add validation for the log-format flag
This commit is contained in:
Matej Trop 2024-05-08 23:11:18 +01:00 • committed by GitHub
parent 7c44c2fee1
commit 73169bbace
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libplugin/util.go
View file

@ -39,7 +39,7 @@ func AuthMethodFromName(n string) AuthMethod {
return -1
}
func ConfigStdioLogrus(p SshPiperPlugin, logger *logrus.Logger) {
func ConfigStdioLogrus(p SshPiperPlugin, formatter logrus.Formatter, logger *logrus.Logger) {
if logger == nil {
logger = logrus.StandardLogger()
}
@ -50,7 +50,11 @@ func ConfigStdioLogrus(p SshPiperPlugin, logger *logrus.Logger) {
logger.SetLevel(lv)
if tty {
logger.SetFormatter(&logrus.TextFormatter{ForceColors: true})
if formatter != nil {
logger.SetFormatter(formatter)
} else {
logger.SetFormatter(&logrus.TextFormatter{ForceColors: true})
}
}
})
}