syslog started

src/ma/archiver/archiver.go

@@ -1,35 +1,28 @@
 package archiver
 
-import "log"
-import "time"
-//import "os"
-//import "fmt"
-//import "net/url"
-import "ma/mqtt"
-//import "ma/config"
-//import "ma/counter"
-import "ma/database"
-
-var dbh *database.DatabaseHandle
+import (
+	"log"
+	"ma/mqtt"
+	"time"
+)
 
+type Message struct {
+	Time    time.Time
+	Topic   string
+	Payload string
+}
 
 func InitArchiver() {
-  log.Printf("Archiver initializing")
-  dbh = database.NewDatabaseHandle()
+	log.Printf("Archiver initializing")
 }
 
 func InputArchiver() {
-  for {
-    select {
-    case mqttMessage := <- mqtt.InputChannel:
-      message := database.Message { time.Now(), mqttMessage.Topic, string(mqttMessage.Payload) }
-      handleMessage(message)
-    }
-  }
+	for mqttMessage := range mqtt.InputChannel {
+		message := Message{time.Now(), mqttMessage.Topic, string(mqttMessage.Payload)}
+		handleMessage(message)
+	}
 }
 
-func handleMessage(message database.Message) {
-  // log.Printf("Archiving Timestamp: %s, Topic: %s, Payload: %s", message.Time, message.Topic, message.Payload)
-  dbh.StoreMessage(&message)
+func handleMessage(message Message) {
+	log.Printf("Archiving Timestamp: %s, Topic: %s, Payload: %s", message.Time, message.Topic, message.Payload)
 }
-