X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-netstatus%2Fmain.go;h=a75582ed8fa97e96048b73a7dedbd6ff722d769c;hb=8a9d96086ca3e1bf73001f8fdd32c5431668baf3;hp=ff94189eb58a5fa9f2f214b9dccb10d3ed64898d;hpb=2416b163f05370fcffb2f62bea000265d10aac42;p=svn42.git

diff --git a/go/r3-netstatus/main.go b/go/r3-netstatus/main.go
index ff94189..a75582e 100644
--- a/go/r3-netstatus/main.go
+++ b/go/r3-netstatus/main.go
@@ -9,7 +9,7 @@ import (
     "time"
     "fmt"
     //~ "./brain"
-    r3events "svn.spreadspace.org/realraum/go.svn/r3-eventbroker_zmq/r3events"
+    r3events "svn.spreadspace.org/realraum/go.svn/r3events"
 )
 
 type SpaceState struct {
@@ -26,6 +26,8 @@ var (
     xmpp_state_save_dir_ string
     r3eventssub_port_ string
     button_press_timeout_ int64 = 3600
+    brain_connect_addr_ string
+    enable_syslog_, enable_debug_ bool
 )
 
 //-------
@@ -36,6 +38,9 @@ func init() {
     flag.StringVar(&xmpp_bot_authstring_, "xbotauth", "", "String that user use to authenticate themselves to the bot")
     flag.StringVar(&xmpp_state_save_dir_,"xstatedir","/flash/var/lib/r3netstatus/",  "Directory to save XMPP bot state in")
     flag.StringVar(&r3eventssub_port_, "eventsubport", "tcp://wuzzler.realraum.at:4244", "zmq address to subscribe r3events")
+    flag.StringVar(&brain_connect_addr_, "brainconnect", "tcp://wuzzler.realraum.at:4245", "address to ask about most recent stored events")
+    flag.BoolVar(&enable_syslog_, "syslog", false, "enable logging to syslog")
+    flag.BoolVar(&enable_debug_, "debug", false, "enable debug output")
     flag.Parse()
 }
 
@@ -59,7 +64,7 @@ func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface
 
     defer func() {
         if x := recover(); x != nil {
-            fmt.Printf("handleIncomingXMPPStanzas: run time panic: %v", x)
+            Debug_.Printf("handleIncomingXMPPStanzas: run time panic: %v", x)
             ps.Unsub(events, "presence","door","buttons","updateinterval")
             close(xmpp_presence_events_chan_)
         }
@@ -68,7 +73,7 @@ func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface
     var present, locked, shut bool = false, true, true
     var last_buttonpress int64 = 0
     var who string
-    button_msg := "The button has been pressed ! Propably someone is bored and in need of company ! ;-)"
+    button_msg := "Dooom ! The button has been pressed ! Propably someone is bored and in need of company ! ;-)"
     present_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowOnline,"Somebody is present"}
     notpresent_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowNotAvailabe,"Nobody is here"}
     button_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowFreeForChat, "The button has been pressed :-)"}
@@ -76,7 +81,7 @@ func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface
     xmpp_presence_events_chan_ <- r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowNotAvailabe, "Nobody is here"}
 
     for eventinterface := range(events) {
-        fmt.Println("event2xmpp", eventinterface)
+        Debug_.Printf("event2xmpp: %T %+v", eventinterface, eventinterface)
         switch event := eventinterface.(type) {
             case r3events.PresenceUpdate:
                 present = event.Present
@@ -99,7 +104,7 @@ func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface
            case r3events.DoorAjarUpdate:
                 shut = event.Shut
                 xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeMessage(present, locked, shut, who, event.Ts), DistributeLevel: r3xmppbot.R3DebugInfo, RememberAsStatus: true}
-            case r3events.ButtonPressUpdate:
+            case r3events.BoreDoomButtonPressEvent:
                 xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: button_msg, DistributeLevel: r3xmppbot.R3OnlineOnlyInfo}
                 xmpp_presence_events_chan_ <- button_status
                 last_buttonpress = event.Ts
@@ -112,7 +117,18 @@ func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface
 	}
 }
 
+func ParseZMQr3Event(lines [][]byte, ps *pubsub.PubSub) {
+    evnt, pubsubcat, err := r3events.UnmarshalByteByte2Event(lines)
+    Debug_.Printf("ParseZMQr3Event: %s %s %s", evnt, pubsubcat, err)
+    if err != nil { return }
+    ps.Pub(evnt, pubsubcat)
+}
+
 func main() {
+    if enable_syslog_ { LogEnableSyslog(); r3xmppbot.LogEnableSyslog() }
+    if enable_debug_ { LogEnableDebuglog(); r3xmppbot.LogEnableDebuglog() }
+    Syslog_.Print("started")
+    defer Syslog_.Print("exiting")
     zmqctx, zmqsub := ZmqsInit(r3eventssub_port_)
     defer zmqctx.Close()
     if zmqsub != nil {defer zmqsub.Close()}
@@ -123,6 +139,7 @@ func main() {
     var xmpperr error
     var bot *r3xmppbot.XmppBot
     bot, xmpp_presence_events_chan_, xmpperr = r3xmppbot.NewStartedBot(xmpp_login_.jid, xmpp_login_.pass, xmpp_bot_authstring_, xmpp_state_save_dir_, true)
+
     ps := pubsub.New(1)
     defer ps.Shutdown()
     //~ brn := brain.New()
@@ -135,10 +152,17 @@ func main() {
     } else {
         fmt.Println(xmpperr)
         fmt.Println("XMPP Bot disabled")
+        Syslog_.Printf("XMPP Bot disabled due to error: %s", xmpperr.Error())
     }
 
-    ticker := time.NewTicker(time.Duration(7) * time.Minute)
+    // --- get update on most recent events ---
+    answ := ZmqsAskQuestionsAndClose(zmqctx, brain_connect_addr_, [][][]byte{[][]byte{[]byte("DoorLockUpdate")}, [][]byte{[]byte("DoorAjarUpdate")}, [][]byte{[]byte("DoorCommandEvent")}, [][]byte{[]byte("PresenceUpdate")}, [][]byte{[]byte("IlluminationSensorUpdate")}, [][]byte{[]byte("TempSensorUpdate")}})
+    for _, a := range(answ) {
+        ParseZMQr3Event(a, ps)
+    }
 
+    // --- receive and distribute events ---
+    ticker := time.NewTicker(time.Duration(7) * time.Minute)
     for {
     select {
         case e := <-zmqsub.In():