so far so good

[svn42.git] / go / r3-eventbroker_zmq / main.go

diff --git a/go/r3-eventbroker_zmq/main.go b/go/r3-eventbroker_zmq/main.go
index af67170..8ab1858 100644 (file)
--- a/go/r3-eventbroker_zmq/main.go
+++ b/go/r3-eventbroker_zmq/main.go
@@ -10,6 +10,7 @@ import (
     "log/syslog"
     "log"
     pubsub "github.com/tuxychandru/pubsub"
+    "./r3events"
 )
 
 //~ func StringArrayToByteArray(ss []string) [][]byte {
@@ -65,6 +66,7 @@ func main() {
     }
 
     ps := pubsub.New(3)
+    defer ps.Shutdown()
     //~ ticker := time.NewTicker(time.Duration(5) * time.Minute)
     publish_these_events_chan := ps.Sub("door", "doorcmd", "presence", "sensors", "buttons", "movement")
 
@@ -78,7 +80,7 @@ func main() {
             //~ case <- ticker.C:
                 //~ MakeTimeTick(ps)
             case event_interface := <- publish_these_events_chan:
-                data, err := FormatEventForSocket(event_interface)
+                data, err := r3events.MarshalEvent2ByteByte(event_interface)
                 log.Printf("publishing %s",data)
                 if err != nil {
                     if Syslog_ != nil {Syslog_.Print(err)}