wn/universal-data-ingest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

less logging

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2023-12-04 14:09:00 +01:00
parent 8e0418791d
commit 65341fc6d2
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/udi/database/database.go
View File

@ -29,13 +29,13 @@ func NewDatabaseHandle(dsn string) *DatabaseHandle {
func (dbh *DatabaseHandle) StoreMeasurement(measurement *Measurement) { func (dbh *DatabaseHandle) StoreMeasurement(measurement *Measurement) {
if ! dbh.initialized { 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 return
} }
result := dbh.dbh.Create(measurement) result := dbh.dbh.Create(measurement)
if result.Error != nil { 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 return
} }

13
src/udi/dispatcher/dispatcher.go
View File

@ -39,7 +39,7 @@ func storeMessage(filename string, item handler.MessageT) {
log.Printf("Unable to write message, message is not archived: %s", err) log.Printf("Unable to write message, message is not archived: %s", err)
return return
} }
log.Printf("Archiving message in file %s", filename) log.Println("Successfully archived message")
} }
func archiver() { func archiver() {
@ -79,9 +79,9 @@ func InputDispatcher() {
func handleMessage(message handler.MessageT) { func handleMessage(message handler.MessageT) {
for _, mapping := range config.Config.TopicMappings { 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 { 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) { if mqtt.TopicMatchesSubscription(message.Topic, subscribedTopic) {
log.Printf("Handle message in handler %s", mapping.Handler) log.Printf("Handle message in handler %s", mapping.Handler)
handler, exists := handlerMap[mapping.Handler] handler, exists := handlerMap[mapping.Handler]
@ -89,11 +89,10 @@ func handleMessage(message handler.MessageT) {
handler.Handle(message) handler.Handle(message)
return return
} else { } 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)
} }

6
src/udi/handlers/mbgw3/mbgw3.go
View File

@ -39,12 +39,12 @@ func NewMbgw3Handler() *Mbgw3Handler {
} }
func (self *Mbgw3Handler) Handle(message handler.MessageT) { 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 var observation Observation
err := json.Unmarshal([]byte(message.Payload), &observation) err := json.Unmarshal([]byte(message.Payload), &observation)
if err != nil { 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 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) self.dbh.StoreMeasurement(&measurement)
} }

4
src/udi/handlers/pv/pv.go
View File

@ -48,12 +48,12 @@ func NewPvHandler() *PvHandler {
} }
func (self *PvHandler) Handle(message handler.MessageT) { 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 var pvValue PvValue
err := json.Unmarshal([]byte(message.Payload), &pvValue) err := json.Unmarshal([]byte(message.Payload), &pvValue)
if err != nil { 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 return
} }