From 65341fc6d2f448582f2c5bb58e4f9a4621086c7c Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Mon, 4 Dec 2023 14:09:00 +0100
Subject: [PATCH] less logging

---
 src/udi/database/database.go     |  4 ++--
 src/udi/dispatcher/dispatcher.go | 11 +++++------
 src/udi/handlers/mbgw3/mbgw3.go  |  6 +++---
 src/udi/handlers/pv/pv.go        |  4 ++--
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/udi/database/database.go b/src/udi/database/database.go
index 3f647ca..7320c44 100644
--- a/src/udi/database/database.go
+++ b/src/udi/database/database.go
@@ -29,13 +29,13 @@ func NewDatabaseHandle(dsn string) *DatabaseHandle {
 
 func (dbh *DatabaseHandle) StoreMeasurement(measurement *Measurement) {
   if ! dbh.initialized {
-    log.Println("Database connection not initialized, can not store, measurement lost")
+    log.Printf("Database connection not initialized, can not store, measurement %s lost", measurement)
     return
   }
 
   result := dbh.dbh.Create(measurement)
   if result.Error != nil {
-    log.Printf("Unable to insert measurement: %s", result.Error)
+    log.Printf("Unable to insert, measurement %s lost, error: %s", measurement, result.Error)
     return
   }
 
diff --git a/src/udi/dispatcher/dispatcher.go b/src/udi/dispatcher/dispatcher.go
index 12033a0..9821174 100644
--- a/src/udi/dispatcher/dispatcher.go
+++ b/src/udi/dispatcher/dispatcher.go
@@ -39,7 +39,7 @@ func storeMessage(filename string, item handler.MessageT) {
     log.Printf("Unable to write message, message is not archived: %s", err)
     return
   }
-  log.Printf("Archiving message in file %s", filename)
+  log.Println("Successfully archived message")
 }
 
 func archiver() {
@@ -79,9 +79,9 @@ func InputDispatcher() {
 
 func handleMessage(message handler.MessageT) {
   for _, mapping := range config.Config.TopicMappings {
-    log.Printf("Testing %s -> %s", mapping.Topics, mapping.Handler)
+    // log.Printf("Testing %s -> %s", mapping.Topics, mapping.Handler)
     for _, subscribedTopic := range mapping.Topics {
-      log.Printf("Testing %s in %s", message.Topic, subscribedTopic)
+      // log.Printf("Testing %s in %s", message.Topic, subscribedTopic)
       if mqtt.TopicMatchesSubscription(message.Topic, subscribedTopic) {
         log.Printf("Handle message in handler %s", mapping.Handler)
         handler, exists := handlerMap[mapping.Handler]
@@ -89,11 +89,10 @@ func handleMessage(message handler.MessageT) {
           handler.Handle(message)
           return
         } else {
-          log.Printf("Handler not found, message is lost")
+          log.Printf("Handler %s not found, message %s is lost", mapping.Handler, message)
         }
-      } else {
-        log.Printf("no match")
       }
     }
   }
+  log.Printf("No match for topic %s, message %s is lost", message.Topic, message)
 }
diff --git a/src/udi/handlers/mbgw3/mbgw3.go b/src/udi/handlers/mbgw3/mbgw3.go
index 6e0f5ea..836fdff 100644
--- a/src/udi/handlers/mbgw3/mbgw3.go
+++ b/src/udi/handlers/mbgw3/mbgw3.go
@@ -39,12 +39,12 @@ func NewMbgw3Handler() *Mbgw3Handler {
 }
 
 func (self *Mbgw3Handler) Handle(message handler.MessageT) {
-  log.Printf("Handler MBGW3 %d processing %s -> %s", self.id, message.Topic, message.Payload)
+//  log.Printf("Handler MBGW3 %d processing %s -> %s", self.id, message.Topic, message.Payload)
 
   var observation Observation
   err := json.Unmarshal([]byte(message.Payload), &observation)
   if err != nil {
-    log.Printf("Unable to parse payload into Observation struct, values are lost: ", err)
+    log.Printf("Unable to parse payload into Observation struct, message %s -> %s is lost, error ", message.Topic, message.Payload, err)
     return
   }
 
@@ -89,7 +89,7 @@ func (self *Mbgw3Handler) Handle(message handler.MessageT) {
     }
   }
 
-  log.Printf("Prepared measurement item: %s", measurement)
+  // log.Printf("Prepared measurement item: %s", measurement)
 
   self.dbh.StoreMeasurement(&measurement)
 }
diff --git a/src/udi/handlers/pv/pv.go b/src/udi/handlers/pv/pv.go
index 44df3cd..36829b7 100644
--- a/src/udi/handlers/pv/pv.go
+++ b/src/udi/handlers/pv/pv.go
@@ -48,12 +48,12 @@ func NewPvHandler() *PvHandler {
 }
 
 func (self *PvHandler) Handle(message handler.MessageT) {
-  log.Printf("Handler PV %d processing %s -> %s", self.id, message.Topic, message.Payload)
+  //log.Printf("Handler PV %d processing %s -> %s", self.id, message.Topic, message.Payload)
 
   var pvValue PvValue
   err := json.Unmarshal([]byte(message.Payload), &pvValue)
   if err != nil {
-    log.Printf("Unable to parse payload into pvValue struct, values are lost: ", err)
+    log.Printf("Unable to parse payload into pvValue struct, message %s -> %s is lost, error: %s", message.Topic, message.Payload, err)
     return
   }