diff --git a/src/ma/archiver/archiver.go b/src/ma/archiver/archiver.go index 6ef7f01..0ece4e9 100644 --- a/src/ma/archiver/archiver.go +++ b/src/ma/archiver/archiver.go @@ -1,6 +1,7 @@ package archiver import ( + "fmt" "log" "ma/mqtt" "time" @@ -27,5 +28,5 @@ func InputArchiver() { func handleMessage(message Message) { 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)) } diff --git a/src/ma/archiver/syslog.go b/src/ma/archiver/syslog.go index f93809b..f4911e0 100644 --- a/src/ma/archiver/syslog.go +++ b/src/ma/archiver/syslog.go @@ -1,7 +1,6 @@ package archiver import ( - "encoding/json" "log" "log/syslog" "ma/config" @@ -36,34 +35,28 @@ func InitSyslog() { } } -func WriteSyslog(message Message) { +func WriteSyslog(message string) { 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 switch config.Config.Syslog.Severity { case "emerg": - syslogWriter.Emerg(string(jsonData)) + syslogWriter.Emerg(message) case "alert": - syslogWriter.Alert(string(jsonData)) + syslogWriter.Alert(message) case "crit": - syslogWriter.Crit(string(jsonData)) + syslogWriter.Crit(message) case "err": - syslogWriter.Err(string(jsonData)) + syslogWriter.Err(message) case "warning": - syslogWriter.Warning(string(jsonData)) + syslogWriter.Warning(message) case "notice": - syslogWriter.Notice(string(jsonData)) + syslogWriter.Notice(message) case "info": - syslogWriter.Info(string(jsonData)) + syslogWriter.Info(message) case "debug": - syslogWriter.Debug(string(jsonData)) + syslogWriter.Debug(message) default: - syslogWriter.Info(string(jsonData)) + syslogWriter.Info(message) } } }