From 7bae3575d57600caa45a2ea9e88e9e3244e8b7ec Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Fri, 26 Apr 2024 20:48:17 +0100
Subject: [PATCH] Tidy VSTP logging

---
 vstp/handler.go   | 6 +-----
 vstp/subscribe.go | 8 +++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/vstp/handler.go b/vstp/handler.go
index 82b0045..c467ef4 100644
--- a/vstp/handler.go
+++ b/vstp/handler.go
@@ -8,12 +8,8 @@ import (
 	"go.uber.org/zap"
 )
 
-var count uint64 = 0
-
 func handle(msg *stomp.Message) {
 	start := time.Now()
-	count++
-	log.Info("Message received", zap.Uint64("total since startup", count))
 	schedule, err := unmarshalData(msg.Body)
 	if err != nil {
 		log.Error("Error unmarshalling VSTP Message", zap.Error(err))
@@ -28,6 +24,6 @@ func handle(msg *stomp.Message) {
 		log.Error("Error processing VSTP Schedule", zap.Error(err))
 	}
 	end := time.Now()
-	duration := start.Sub(end)
+	duration := end.Sub(start)
 	log.Info("Message processed", zap.Duration("processing-time", duration))
 }
diff --git a/vstp/subscribe.go b/vstp/subscribe.go
index 5014709..d99f11f 100644
--- a/vstp/subscribe.go
+++ b/vstp/subscribe.go
@@ -1,7 +1,6 @@
 package vstp
 
 import (
-	"fmt"
 	"time"
 
 	"git.fjla.uk/owlboard/timetable-mgr/log"
@@ -46,14 +45,13 @@ func Subscribe() {
 				for {
 					msg := <-sub.C
 					if msg.Err != nil {
-						log.Error("STOMP Message Error", zap.Error(msg.Err))
+						log.Error("VSTP Message Error", zap.Error(msg.Err))
 					} else {
 						if msg != nil {
-							log.Info("STOMP Message Received")
-							fmt.Println(string(msg.Body))
+							log.Info("VSTP Message Received")
 							handle(msg)
 						} else {
-							log.Info("STOMP Message Empty")
+							log.Info("VSTP Message Empty")
 						}
 					}
 				}