Use RFC 5424-like structured log format

[govpn.git] / src / cypherpunks.ru / govpn / logger.go

diff --git a/src/cypherpunks.ru/govpn/logger.go b/src/cypherpunks.ru/govpn/logger.go
index f646338a037c0a2cb7fe271ca6f5857d5b8ebac3..b110ce3e55553fb91c6a8e1d4bbb2fd41f5afadb 100644 (file)
--- a/src/cypherpunks.ru/govpn/logger.go
+++ b/src/cypherpunks.ru/govpn/logger.go
@@ -36,12 +36,20 @@ func SyslogEnable() {
        }
 }
 
-// Call either syslog-related logger.Println if SyslogEnabled,
-// default log.Println otherwise.
-func Println(v ...interface{}) {
+// Call either syslog-related logger.Printf if SyslogEnabled,
+// default log.Printf otherwise.
+func Printf(f string, v ...interface{}) {
        if sysloger == nil {
-               log.Println(v...)
+               log.Printf(f, v...)
        } else {
-               sysloger.Println(v...)
+               sysloger.Printf(f, v...)
+       }
+}
+
+// Call both default log.Printf and syslog-related one.
+func BothPrintf(f string, v ...interface{}) {
+       log.Printf(f, v...)
+       if sysloger != nil {
+               sysloger.Printf(f, v...)
        }
 }