X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-eventbroker_zmq%2Fmain.go;h=8ab1858b07540d74eb32255667bfaa8339fd555f;hb=2416b163f05370fcffb2f62bea000265d10aac42;hp=dfdaff5079ce85679773e10c48b6c40b432716f2;hpb=7be7cb4517b411371b18375fd181d48df2184739;p=svn42.git

diff --git a/go/r3-eventbroker_zmq/main.go b/go/r3-eventbroker_zmq/main.go
index dfdaff5..8ab1858 100644
--- a/go/r3-eventbroker_zmq/main.go
+++ b/go/r3-eventbroker_zmq/main.go
@@ -6,9 +6,11 @@ import (
     "fmt"
     "os"
     "flag"
-    "time"
+    //~ "time"
     "log/syslog"
     "log"
+    pubsub "github.com/tuxychandru/pubsub"
+    "./r3events"
 )
 
 //~ func StringArrayToByteArray(ss []string) [][]byte {
@@ -36,30 +38,58 @@ func usage() {
 }
 
 func init() {
-    flag.StringVar(&doorsub_addr_, "doorsubaddr", "tcp://wuzzler.realraum.at:4242", "zmq door event publish addr")
-    flag.StringVar(&sensorssub_port_, "sensorsubport", "tcp://:4243", "zmq public/listen socket addr for incoming sensor data")
-    flag.StringVar(&pub_port_, "pubport", "tcp://:4244", "zmq port publishing consodilated events")
+    flag.StringVar(&doorsub_addr_, "doorsubaddr", "tcp://torwaechter.realraum.at:4242", "zmq door event publish addr")
+    flag.StringVar(&sensorssub_port_, "sensorsubport", "tcp://*:4243", "zmq public/listen socket addr for incoming sensor data")
+    flag.StringVar(&pub_port_, "pubport", "tcp://*:4244", "zmq port publishing consodilated events")
     flag.StringVar(&keylookup_addr_, "keylookupaddr", "ipc:///run/tuer/door_keyname.ipc", "address to use for key/name lookups")
-    flag.BoolVar(&use_syslog_, "syslog", false, "log to syslog local1 facility")
+    flag.BoolVar(&use_syslog_, "syslog", false, "log to syslog local2 facility")
     flag.Usage = usage
     flag.Parse()
 }
 
 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 | syslog.LOG_LOCAL2, 0)
+        Syslog_, logerr = syslog.NewLogger(syslog.LOG_INFO | (18<<3), 0)
+        //~ Syslog_, logerr = syslog.NewLogger(syslog.LOG_INFO | syslog.LOG_LOCAL2, 0)
         if logerr != nil { panic(logerr) }
         Syslog_.Print("started")
         defer Syslog_.Print("exiting")
     }
 
-    //~ nick, err := keylookup_socket.LookupCardIdNick(keyhexid)
-    
+    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 {
+        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 := r3events.MarshalEvent2ByteByte(event_interface)
+                log.Printf("publishing %s",data)
+                if err != nil {
+                    if Syslog_ != nil {Syslog_.Print(err)}
+                    continue
+                }
+                if err := pub_out_socket.Send(data); err != nil {
+                    panic(err)
+                }
+        }
+    }
+
 }