From 902ae28bf6301217b58aa17f7c62b39257401e83 Mon Sep 17 00:00:00 2001 From: Sambhav Saggi <17993169+sambhavsaggi@users.noreply.github.com> Date: Mon, 2 Aug 2021 07:28:28 -0400 Subject: [PATCH] Add protocol, make sure syslog actually logs --- internal/log.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/internal/log.go b/internal/log.go index 6b505d7cd..9cded9411 100644 --- a/internal/log.go +++ b/internal/log.go @@ -132,7 +132,7 @@ func SetupHookLogging(hooks []config.LogrusHook, componentName string) { setupFileHook(hook, level, componentName) case "syslog": checkSyslogHookParams(hook.Params) - setupSyslogHook(hook, level, componentName) + setupSyslogHook(hook) default: logrus.Fatalf("Unrecognised logging hook type: %s", hook.Type) } @@ -187,10 +187,20 @@ func checkSyslogHookParams(params map[string]interface{}) { if _, ok := addr.(string); !ok { logrus.Fatalf("Parameter \"address\" for logging hook of type \"syslog\" should be a string") } + + proto, ok := params["protocol"] + if !ok { + logrus.Fatalf("Expecting a parameter \"protocol\" for logging hook of type \"syslog\"") + } + + if _, ok := proto.(string); !ok { + logrus.Fatalf("Parameter \"protocol\" for logging hook of type \"syslog\" should be a string") + } + } -func setupSyslogHook(hook config.LogrusHook, level logrus.Level, componentName string) { - syslogHook, err := lSyslog.NewSyslogHook("udp", hook.Params["address"].(string), syslog.LOG_INFO, "") +func setupSyslogHook(hook config.LogrusHook) { + syslogHook, err := lSyslog.NewSyslogHook(hook.Params["protocol"].(string), hook.Params["address"].(string), syslog.LOG_INFO, "") if err == nil { logrus.AddHook(syslogHook) }