X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-netstatus%2Fmain.go;h=afebd58b899424b4453573433902df4b6efdd7a4;hb=289d51785a79294d234f1de868352edf784394af;hp=6f53ac3bd64b80a2c750cc39905473d5a5d7d49e;hpb=70bd6ea215fdd1dbd2eb9556ff4aa0a2acde24bc;p=svn42.git diff --git a/go/r3-netstatus/main.go b/go/r3-netstatus/main.go index 6f53ac3..afebd58 100644 --- a/go/r3-netstatus/main.go +++ b/go/r3-netstatus/main.go @@ -1,3 +1,5 @@ +// (c) Bernhard Tittelbach, 2013 + package main import ( @@ -7,6 +9,7 @@ import ( "time" "fmt" //~ "./brain" + r3events "svn.spreadspace.org/realraum/go.svn/r3-eventbroker_zmq/r3events" ) type SpaceState struct { @@ -17,12 +20,14 @@ type SpaceState struct { } var ( - presence_socket_path_ string xmpp_presence_events_chan_ chan interface{} xmpp_login_ struct {jid string; pass string} xmpp_bot_authstring_ string xmpp_state_save_dir_ string + r3eventssub_port_ string button_press_timeout_ int64 = 3600 + brain_connect_addr_ string + enable_syslog_, enable_debug_ bool ) //------- @@ -31,8 +36,11 @@ func init() { flag.StringVar(&xmpp_login_.jid, "xjid", "realrauminfo@realraum.at/Tuer", "XMPP Bot Login JID") flag.StringVar(&xmpp_login_.pass, "xpass", "", "XMPP Bot Login Password") flag.StringVar(&xmpp_bot_authstring_, "xbotauth", "", "String that user use to authenticate themselves to the bot") - flag.StringVar(&presence_socket_path_,"presencesocket", "/var/run/tuer/presence.socket", "Path to presence socket") 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 logging") flag.Parse() } @@ -56,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_) } @@ -65,39 +73,42 @@ 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 :-)"} - + xmpp_presence_events_chan_ <- r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowNotAvailabe, "Nobody is here"} - + for eventinterface := range(events) { + Debug_.Println("event2xmpp", eventinterface) switch event := eventinterface.(type) { - case PresenceUpdate: + case r3events.PresenceUpdate: present = event.Present xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeMessage(present, locked, shut, who, event.Ts), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: true} if present { xmpp_presence_events_chan_ <- present_status } else { xmpp_presence_events_chan_ <- notpresent_status - } - case DoorCommandEvent: + } + case r3events.DoorCommandEvent: if len(event.Who) > 0 && len(event.Using) > 0 { who = fmt.Sprintf("%s (%s)",event.Who, event.Using) } else { who = event.Who } xmpp_presence_events_chan_ <- fmt.Sprintln("DoorCommand:",event.Command, "using", event.Using, "by", event.Who, time.Unix(event.Ts,0)) - case DoorStatusUpdate: + case r3events.DoorLockUpdate: locked = event.Locked + xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeMessage(present, locked, shut, who, event.Ts), DistributeLevel: r3xmppbot.R3DebugInfo, RememberAsStatus: true} + 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 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 - case TimeTick: + case r3events.TimeTick: if present && last_buttonpress > 0 && time.Now().Unix() - last_buttonpress > button_press_timeout_ { xmpp_presence_events_chan_ <- present_status last_buttonpress = 0 @@ -107,15 +118,24 @@ func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface } 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()} + if zmqsub == nil { + panic("zmq sockets must not be nil !!") + } + 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) - newlinequeue := make(chan string, 1) ps := pubsub.New(1) - //~ brn := brain.New() - defer close(newlinequeue) defer ps.Shutdown() + //~ brn := brain.New() //~ defer brn.Shutdown() go EventToWeb(ps) @@ -125,16 +145,23 @@ func main() { } else { fmt.Println(xmpperr) fmt.Println("XMPP Bot disabled") + Syslog_.Printf("XMPP Bot disabled due to error: %s", xmpperr.Error()) } - go ReadFromUSocket(presence_socket_path_, newlinequeue) - 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 := <-newlinequeue: - ParseSocketInputLine(e, ps) //, brn) + case e := <-zmqsub.In(): + ParseZMQr3Event(e, ps) //, brn) case <-ticker.C: - ps.Pub(TimeTick{time.Now().Unix()}, "updateinterval") + ps.Pub(r3events.TimeTick{time.Now().Unix()}, "updateinterval") } } }