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 dbd35eb..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 {
@@ -48,11 +49,13 @@ func init() {
 
 func main() {
     zmqctx, sub_in_chans, pub_out_socket, keylookup_socket := ZmqsInit(doorsub_addr_, sensorssub_port_, pub_port_, keylookup_addr_)
+    if sub_in_chans != nil {defer sub_in_chans.Close()}
     defer zmqctx.Close()
-    defer sub_in_chans.Close()
-    defer pub_out_socket.Close()
-    defer keylookup_socket.Close()
-    
+    if pub_out_socket != nil {defer pub_out_socket.Close()}
+    if keylookup_socket != nil {defer keylookup_socket.Close()}
+    if sub_in_chans == nil || pub_out_socket == nil || keylookup_socket == nil {
+        panic("zmq sockets must not be nil !!")
+    }
     if use_syslog_ {
         var logerr error
         Syslog_, logerr = syslog.NewLogger(syslog.LOG_INFO | (18<<3), 0)
@@ -61,26 +64,26 @@ func main() {
         Syslog_.Print("started")
         defer Syslog_.Print("exiting")
     }
-    
+
     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")
-    
+
     go MetaEventRoutine_Movement(ps, 10, 20, 10)
     go MetaEventRoutine_Presence(ps)
-    
+
     for {
-        log.Print("for loop")
         select {
             case subin := <- sub_in_chans.In():
                 ParseSocketInputLine(subin, ps, keylookup_socket)
             //~ case <- ticker.C:
                 //~ MakeTimeTick(ps)
             case event_interface := <- publish_these_events_chan:
-                data, err := FormatEventForSocket(event_interface)
-                log.Print("publishing", data)
+                data, err := r3events.MarshalEvent2ByteByte(event_interface)
+                log.Printf("publishing %s",data)
                 if err != nil {
-                    Syslog_.Print(err)
+                    if Syslog_ != nil {Syslog_.Print(err)}
                     continue
                 }
                 if err := pub_out_socket.Send(data); err != nil {
@@ -89,6 +92,4 @@ func main() {
         }
     }
 
-    //~ nick, err := keylookup_socket.LookupCardIdNick(keyhexid)
-    
 }