compiles

.gitignore

@@ -1,6 +1,6 @@
-src/udi/udi
-src/udi/main
-src/udi/migrate_schema
+src/ma/ma
+src/ma/main
+src/ma/migrate_schema
 tmp/
 ENVDB
 ENVDB.cluster

src/ma/archiver/archiver.go

@@ -2,11 +2,11 @@ package archiver
 
 import "log"
 import "time"
-import "os"
-import "fmt"
-import "net/url"
+//import "os"
+//import "fmt"
+//import "net/url"
 import "ma/mqtt"
-import "ma/config"
+//import "ma/config"
 import "ma/counter"
 import "ma/database"
 
@@ -20,13 +20,12 @@ func InputArchiver() {
     select {
     case mqttMessage := <- mqtt.InputChannel:
       message := database.Message { time.Now(), mqttMessage.Topic, string(mqttMessage.Payload) }
-      archiverChannel <- message
       handleMessage(message)
     }
   }
 }
 
-func handleMessage(message database.MessageT) {
+func handleMessage(message database.Message) {
   log.Printf("Archiving %", message)
   counter.S("Stored")
 }

src/ma/counter/counter.go

@@ -45,32 +45,11 @@ func F(id string) {
   }
 }
 
-func SH(id string) {
-  if _, ok := stats.Handled[id]; ok {
-    tuple := stats.Handled[id]
-    tuple.Successful += 1
-    stats.Handled[id] = tuple
-  } else {
-    stats.Handled[id] = statsTuple_t { Successful:1, Failed:0, }
-  }
-}
-
-func FH(id string) {
-  if _, ok := stats.Handled[id]; ok {
-    tuple := stats.Handled[id]
-    tuple.Failed += 1
-    stats.Handled[id] = tuple
-  } else {
-    stats.Handled[id] = statsTuple_t { Successful:0, Failed:1, }
-  }
-}
-
 func InitCounter() {
   stats = stats_t {
     Received: statsTuple_t {Successful:0,Failed:0,},
     Stored: statsTuple_t {Successful:0,Failed:0,},
     Skipped: statsTuple_t {Successful:0,Failed:0,},
-    Handled: make(map[string]statsTuple_t),
   }
 
   go func() { 

src/ma/database/abstract_database.go

@@ -1,7 +1,7 @@
 package database
 
 import "time"
-import "gorm.io/gorm"
+// import "gorm.io/gorm"
 
 
 type Message struct {

src/ma/database/database.go

@@ -4,7 +4,7 @@ package database
 import (
   "log"
   //"time"
-  "fmt"
+  //"fmt"
   "ma/counter"
   "gorm.io/driver/postgres"
   "gorm.io/gorm"

src/ma/mqtt/mqtt.go

@@ -6,8 +6,8 @@ import "fmt"
 import MQTT "github.com/eclipse/paho.mqtt.golang"
 import "github.com/google/uuid"
 import "crypto/tls"
-import "udi/config"
-import "udi/counter"
+import "ma/config"
+import "ma/counter"
 
 type Message struct {
   Topic string
@@ -21,22 +21,21 @@ var mqttClient MQTT.Client
 
 func onMessageReceived(client MQTT.Client, message MQTT.Message) {
   // log.Printf("Message received, topic: %s, payload: %s\n", message.Topic(), message.Payload())
-  for _, i := range config.Config.ExcludeTopics {
-    if i == message.Topic {
-      counter.S("Skipped")
-      return
-    }
-  }
-
   m := Message { 
     Topic: message.Topic(), 
     Payload: message.Payload(),
   }
+  for _, i := range config.Config.ExcludeTopics {
+    if i == m.Topic {
+      counter.S("Skipped")
+      log.Println("Message skipped")
+      return
+    }
+  }
   select {
   case InputChannel <- m:
     counter.S("Received")
-    {}
-    //log.Println("Message sent to channel")
+    log.Println("Message sent to channel")
   default:
     log.Println("Channel full, message lost")
     counter.F("Received")