From 69489156ce4eb5fac36d965a2f851ad764f58e64 Mon Sep 17 00:00:00 2001 From: Bernhard Tittelbach Date: Sat, 26 Oct 2013 21:07:21 +0000 Subject: [PATCH] prepare for recovery code (unfinished) --- go/r3-netstatus/main.go | 56 +++++++++++++++++--------------- go/r3-netstatus/r3xmppbot/r3xmppbot.go | 7 ++-- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/go/r3-netstatus/main.go b/go/r3-netstatus/main.go index 3a52824..85309ae 100644 --- a/go/r3-netstatus/main.go +++ b/go/r3-netstatus/main.go @@ -20,7 +20,6 @@ type SpaceState struct { } var ( - xmpp_presence_events_chan_ chan interface{} xmpp_login_ struct {jid string; pass string} xmpp_bot_authstring_ string xmpp_state_save_dir_ string @@ -66,14 +65,14 @@ func composeDoorLockMessage(locked bool, frontshut r3events.DoorAjarUpdate, door } } -func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface{}) { +func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan chan <- interface{}) { events := ps.Sub("presence","door","buttons","updateinterval") defer func() { + ps.Unsub(events, "presence","door","buttons","updateinterval") if x := recover(); x != nil { + //defer ist called _after_ EventToXMPP function has returned. Thus we recover after returning from this function. Syslog_.Printf("handleIncomingXMPPStanzas: run time panic: %v", x) - ps.Unsub(events, "presence","door","buttons","updateinterval") - close(xmpp_presence_events_chan_) } }() @@ -86,7 +85,7 @@ func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface 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"} + xmpp_presence_events_chan <- r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowNotAvailabe, "Nobody is here"} for eventinterface := range(events) { Debug_.Printf("event2xmpp: %T %+v", eventinterface, eventinterface) @@ -94,38 +93,54 @@ func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface case r3events.PresenceUpdate: present = event.Present if present { - xmpp_presence_events_chan_ <- present_status + xmpp_presence_events_chan <- present_status } else { - xmpp_presence_events_chan_ <- notpresent_status + xmpp_presence_events_chan <- notpresent_status } case r3events.DoorCommandEvent: last_door_cmd = event - xmpp_presence_events_chan_ <- fmt.Sprintln("DoorCommand:",event.Command, "using", event.Using, "by", event.Who, time.Unix(event.Ts,0)) + xmpp_presence_events_chan <- fmt.Sprintln("DoorCommand:",event.Command, "using", event.Using, "by", event.Who, time.Unix(event.Ts,0)) case r3events.DoorLockUpdate: if frontlock != event.Locked { - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeDoorLockMessage(event.Locked, last_frontdoor_ajar, last_door_cmd, event.Ts), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: true} + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: composeDoorLockMessage(event.Locked, last_frontdoor_ajar, last_door_cmd, event.Ts), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: true} } frontlock = event.Locked case r3events.DoorAjarUpdate: if last_frontdoor_ajar.Shut != event.Shut { - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: fmt.Sprintf("Frontdoor is %s (%s)",IfThenElseStr(event.Shut,"now shut.","ajar."),time.Unix(event.Ts,0).String()), DistributeLevel: r3xmppbot.R3DebugInfo, RememberAsStatus: false} + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: fmt.Sprintf("Frontdoor is %s (%s)",IfThenElseStr(event.Shut,"now shut.","ajar."),time.Unix(event.Ts,0).String()), DistributeLevel: r3xmppbot.R3DebugInfo, RememberAsStatus: false} } last_frontdoor_ajar = event case r3events.BackdoorAjarUpdate: - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: fmt.Sprintf("Backdoor is %s (%s)",IfThenElseStr(event.Shut,"now shut.","ajar!"),time.Unix(event.Ts,0).String()), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: false} + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: fmt.Sprintf("Backdoor is %s (%s)",IfThenElseStr(event.Shut,"now shut.","ajar!"),time.Unix(event.Ts,0).String()), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: false} case r3events.BoreDoomButtonPressEvent: - xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: button_msg, DistributeLevel: r3xmppbot.R3OnlineOnlyInfo} - xmpp_presence_events_chan_ <- button_status + xmpp_presence_events_chan <- r3xmppbot.XMPPMsgEvent{Msg: button_msg, DistributeLevel: r3xmppbot.R3OnlineOnlyInfo} + xmpp_presence_events_chan <- button_status last_buttonpress = event.Ts case r3events.TimeTick: if present && last_buttonpress > 0 && time.Now().Unix() - last_buttonpress > button_press_timeout_ { - xmpp_presence_events_chan_ <- present_status + xmpp_presence_events_chan <- present_status last_buttonpress = 0 } } } } +func RunXMPPBot(ps *pubsub.PubSub) { + var xmpperr error + var bot *r3xmppbot.XmppBot + var xmpp_presence_events_chan chan interface{} + for { + bot, xmpp_presence_events_chan, xmpperr = r3xmppbot.NewStartedBot(xmpp_login_.jid, xmpp_login_.pass, xmpp_bot_authstring_, xmpp_state_save_dir_, true) + if xmpperr == nil { + EventToXMPP(ps, xmpp_presence_events_chan) + bot.StopBot() + } else { + Syslog_.Printf("Error starting XMPP Bot: %s", xmpperr.Error()) + } + time.Sleep(5 * time.Second) + } +} + func ParseZMQr3Event(lines [][]byte, ps *pubsub.PubSub) { evnt, pubsubcat, err := r3events.UnmarshalByteByte2Event(lines) Debug_.Printf("ParseZMQr3Event: %s %s %s", evnt, pubsubcat, err) @@ -145,24 +160,13 @@ func main() { 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) - ps := pubsub.New(1) defer ps.Shutdown() //~ brn := brain.New() //~ defer brn.Shutdown() go EventToWeb(ps) - if xmpperr == nil { - defer bot.StopBot() - go EventToXMPP(ps, xmpp_presence_events_chan_) - } else { - fmt.Println(xmpperr) - fmt.Println("XMPP Bot disabled") - Syslog_.Printf("XMPP Bot disabled due to error: %s", xmpperr.Error()) - } + go RunXMPPBot(ps) // --- get update on most recent events --- answ := ZmqsAskQuestionsAndClose(zmqctx, brain_connect_addr_, [][][]byte{[][]byte{[]byte("DoorCommandEvent")}, [][]byte{[]byte("DoorLockUpdate")}, [][]byte{[]byte("DoorAjarUpdate")}, [][]byte{[]byte("PresenceUpdate")}, [][]byte{[]byte("IlluminationSensorUpdate")}, [][]byte{[]byte("TempSensorUpdate")}}) diff --git a/go/r3-netstatus/r3xmppbot/r3xmppbot.go b/go/r3-netstatus/r3xmppbot/r3xmppbot.go index 141e541..e2c4588 100644 --- a/go/r3-netstatus/r3xmppbot/r3xmppbot.go +++ b/go/r3-netstatus/r3xmppbot/r3xmppbot.go @@ -185,12 +185,14 @@ func (botdata *XmppBot) handleEventsforXMPP(xmppout chan <- xmpp.Stanza, presenc defer func() { if x := recover(); x != nil { Syslog_.Printf("handleEventsforXMPP: run time panic: %v", x) + //FIXME: signal that xmpp bot has crashed } }() for { select { - case pe := <-presence_events: + case pe, pe_still_open := <-presence_events: + if ! pe_still_open { break } Debug_.Printf("handleEventsforXMPP<-presence_events: %T %+v", pe, pe) switch pec := pe.(type) { case xmpp.Stanza: @@ -219,7 +221,8 @@ func (botdata *XmppBot) handleEventsforXMPP(xmppout chan <- xmpp.Stanza, presenc break } - case je := <-jabber_events: + case je, je_still_open := <-jabber_events: + if ! je_still_open { break } Debug_.Printf("handleEventsforXMPP<-jabber_events: %T %+v", je, je) simple_jid := removeJIDResource(je.JID) jid_data, jid_in_map := botdata.realraum_jids_[simple_jid] -- 1.7.10.4