From f02e3ce644754b28ffa7d9e4a8bd8268b77addca Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Wed, 19 Jul 2023 14:22:29 +0100
Subject: [PATCH] Tidy temporary message log format

---
 .dockerignore         |  2 +-
 .gitignore            |  2 +-
 src/messaging/vstp.go | 17 +++++++++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 72e59fd..7b9a475 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,7 +7,7 @@
 *.dll
 *.so
 *.dylib
-*.txt
+message-logs
 
 # Test binary, built with `go test -c`
 *.test
diff --git a/.gitignore b/.gitignore
index 72e59fd..7b9a475 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 *.dll
 *.so
 *.dylib
-*.txt
+message-logs
 
 # Test binary, built with `go test -c`
 *.test
diff --git a/src/messaging/vstp.go b/src/messaging/vstp.go
index a4dd0c8..772bf6a 100644
--- a/src/messaging/vstp.go
+++ b/src/messaging/vstp.go
@@ -1,6 +1,7 @@
 package messaging
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"time"
@@ -43,9 +44,21 @@ func handle(msg *stomp.Message) {
 
 func saveToFile(msg string) {
 	timestamp := time.Now().Format("2006-01-02T15:04:05")
-	path := fmt.Sprintf("%s-msg.txt", timestamp)
+	path := fmt.Sprintf("message-logs/%s-msg.txt", timestamp)
 
-	err := ioutil.WriteFile(path, []byte(msg), 0644)
+	var decodedData interface{}
+	if err := json.Unmarshal([]byte(msg), &decodedData); err != nil {
+		log.Msg.Error("Error decoding JSON: " + err.Error())
+		return
+	}
+
+	prettyJSON, err := json.MarshalIndent(decodedData, "", "  ")
+	if err != nil {
+		log.Msg.Error("Error marshaling data to JSON: " + err.Error())
+		return
+	}
+
+	err = ioutil.WriteFile(path, prettyJSON, 0644)
 	if err != nil {
 		log.Msg.Error("Error saving message: " + err.Error())
 		return