X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-eventbroker_zmq%2Fmain.go;h=492e7fb01c31b6231e229b06f77f078f48483ca5;hb=1e8dcdb177ed0616d35ce6777ef920171dadb6ec;hp=10c87dc534fb6f91ee7b562ce855733093b34a5c;hpb=b40171692bb6090aae3e75c4eb355ce077a61a89;p=svn42.git

diff --git a/go/r3-eventbroker_zmq/main.go b/go/r3-eventbroker_zmq/main.go
index 10c87dc..492e7fb 100644
--- a/go/r3-eventbroker_zmq/main.go
+++ b/go/r3-eventbroker_zmq/main.go
@@ -3,12 +3,10 @@
 package main
 
 import (
-    "fmt"
-    "os"
     "flag"
     //~ "time"
     pubsub "github.com/tuxychandru/pubsub"
-    r3events "svn.spreadspace.org/realraum/go.svn/r3-eventbroker_zmq/r3events"
+    r3events "svn.spreadspace.org/realraum/go.svn/r3events"
 )
 
 //~ func StringArrayToByteArray(ss []string) [][]byte {
@@ -27,16 +25,13 @@ var (
     pub_port_ string
     keylookup_addr_ string
     brain_listen_addr_ string
+    door_cmd_addr_ string
     use_syslog_ bool
     enable_debuglog_ bool
 )
 
-func usage() {
-    fmt.Fprintf(os.Stderr, "Usage: zmq_broker_event_transformer [options]\n")
-    flag.PrintDefaults()
-}
-
 func init() {
+    flag.StringVar(&door_cmd_addr_, "doorcmdaddr", "ipc:///run/tuer/door_cmd.ipc", "zmq door event publish addr")
     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")
@@ -44,7 +39,6 @@ func init() {
     flag.StringVar(&brain_listen_addr_, "brainlisten", "tcp://*:4245", "address to listen for requests about latest stored event")
     flag.BoolVar(&use_syslog_, "syslog", false, "log to syslog local2 facility")
     flag.BoolVar(&enable_debuglog_, "debug", false, "enable debug logging")
-    flag.Usage = usage
     flag.Parse()
 }
 
@@ -73,7 +67,13 @@ func main() {
     go BrainCenter(zmqctx, brain_listen_addr_, store_these_events_chan)
 
     go MetaEventRoutine_Movement(ps, 10, 20, 10)
-    go MetaEventRoutine_Presence(ps)
+    go MetaEventRoutine_Presence(ps, 21, 200)
+
+    // --- get update on most recent status ---
+    answ := ZmqsAskQuestionsAndClose(zmqctx, door_cmd_addr_, [][][]byte{[][]byte{[]byte("status")}})
+    for _, a := range(answ) {
+        ParseSocketInputLine(a, ps, keylookup_socket)
+    }
 
     publish_these_events_chan := ps.Sub("door", "doorcmd", "presence", "sensors", "buttons", "movement")
     for {