more proper import

[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..0495edd 100644 (file)
--- a/go/r3-eventbroker_zmq/main.go
+++ b/go/r3-eventbroker_zmq/main.go
@@ -7,9 +7,8 @@ import (
     "os"
     "flag"
     //~ "time"
-    "log/syslog"
-    "log"
     pubsub "github.com/tuxychandru/pubsub"
+    r3events "svn.spreadspace.org/realraum/go.svn/r3events"
 )
 
 //~ func StringArrayToByteArray(ss []string) [][]byte {
@@ -27,8 +26,9 @@ var (
     sensorssub_port_ string
     pub_port_ string
     keylookup_addr_ string
+    brain_listen_addr_ string
     use_syslog_ bool
-    Syslog_ *log.Logger
+    enable_debuglog_ bool
 )
 
 func usage() {
@@ -41,12 +41,21 @@ func init() {
     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.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()
 }
 
 func main() {
+    if enable_debuglog_ { LogEnableDebuglog() }
+    if use_syslog_ {
+        LogEnableSyslog()
+        Syslog_.Print("started")
+        defer Syslog_.Print("exiting")
+    }
+
     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()
@@ -55,22 +64,18 @@ func main() {
     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)
-        //~ Syslog_, logerr = syslog.NewLogger(syslog.LOG_INFO | syslog.LOG_LOCAL2, 0)
-        if logerr != nil { panic(logerr) }
-        Syslog_.Print("started")
-        defer Syslog_.Print("exiting")
-    }
 
-    ps := pubsub.New(3)
+    ps := pubsub.New(10)
+    defer ps.Shutdown() // ps.Shutdown should be called before zmq_ctx.Close(), since it will cause goroutines to shutdown and close zqm_sockets which is needed for zmq_ctx.Close() to return
     //~ ticker := time.NewTicker(time.Duration(5) * time.Minute)
-    publish_these_events_chan := ps.Sub("door", "doorcmd", "presence", "sensors", "buttons", "movement")
+
+    store_these_events_chan := ps.Sub("door", "doorcmd", "presence", "sensors", "buttons", "movement")
+    go BrainCenter(zmqctx, brain_listen_addr_, store_these_events_chan)
 
     go MetaEventRoutine_Movement(ps, 10, 20, 10)
     go MetaEventRoutine_Presence(ps)
 
+    publish_these_events_chan := ps.Sub("door", "doorcmd", "presence", "sensors", "buttons", "movement")
     for {
         select {
             case subin := <- sub_in_chans.In():
@@ -78,10 +83,10 @@ func main() {
             //~ case <- ticker.C:
                 //~ MakeTimeTick(ps)
             case event_interface := <- publish_these_events_chan:
-                data, err := FormatEventForSocket(event_interface)
-                log.Printf("publishing %s",data)
+                data, err := r3events.MarshalEvent2ByteByte(event_interface)
+                Debug_.Printf("publishing %s",data)
                 if err != nil {
-                    if Syslog_ != nil {Syslog_.Print(err)}
+                    Syslog_.Print(err)
                     continue
                 }
                 if err := pub_out_socket.Send(data); err != nil {