adjust logging format
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package archiver
|
package archiver
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"ma/mqtt"
|
"ma/mqtt"
|
||||||
"time"
|
"time"
|
||||||
@@ -27,5 +28,5 @@ func InputArchiver() {
|
|||||||
func handleMessage(message Message) {
|
func handleMessage(message Message) {
|
||||||
log.Printf("Archiving Timestamp: %s, Topic: %s, Payload: %s", message.Time, message.Topic, message.Payload)
|
log.Printf("Archiving Timestamp: %s, Topic: %s, Payload: %s", message.Time, message.Topic, message.Payload)
|
||||||
|
|
||||||
WriteSyslog(message)
|
WriteSyslog(fmt.Sprintf("| TS: %s | TOPIC: %s | PAYLOAD: %s |", message.Time.String(), message.Topic, message.Payload))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package archiver
|
package archiver
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"log"
|
"log"
|
||||||
"log/syslog"
|
"log/syslog"
|
||||||
"ma/config"
|
"ma/config"
|
||||||
@@ -36,34 +35,28 @@ func InitSyslog() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func WriteSyslog(message Message) {
|
func WriteSyslog(message string) {
|
||||||
if syslogWriter != nil {
|
if syslogWriter != nil {
|
||||||
jsonData, err := json.Marshal(message)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("Failed to marshal message to JSON: %v", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send to syslog based on configured severity
|
// Send to syslog based on configured severity
|
||||||
switch config.Config.Syslog.Severity {
|
switch config.Config.Syslog.Severity {
|
||||||
case "emerg":
|
case "emerg":
|
||||||
syslogWriter.Emerg(string(jsonData))
|
syslogWriter.Emerg(message)
|
||||||
case "alert":
|
case "alert":
|
||||||
syslogWriter.Alert(string(jsonData))
|
syslogWriter.Alert(message)
|
||||||
case "crit":
|
case "crit":
|
||||||
syslogWriter.Crit(string(jsonData))
|
syslogWriter.Crit(message)
|
||||||
case "err":
|
case "err":
|
||||||
syslogWriter.Err(string(jsonData))
|
syslogWriter.Err(message)
|
||||||
case "warning":
|
case "warning":
|
||||||
syslogWriter.Warning(string(jsonData))
|
syslogWriter.Warning(message)
|
||||||
case "notice":
|
case "notice":
|
||||||
syslogWriter.Notice(string(jsonData))
|
syslogWriter.Notice(message)
|
||||||
case "info":
|
case "info":
|
||||||
syslogWriter.Info(string(jsonData))
|
syslogWriter.Info(message)
|
||||||
case "debug":
|
case "debug":
|
||||||
syslogWriter.Debug(string(jsonData))
|
syslogWriter.Debug(message)
|
||||||
default:
|
default:
|
||||||
syslogWriter.Info(string(jsonData))
|
syslogWriter.Info(message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user