IfThenElseStr(present, "Somebody is present!" , "Everybody left."),
IfThenElseStr(locked, "locked","unlocked"),
IfThenElseStr(shut, "shut","ajar"),
- IfThenElseStr(who == "","", " by " + who),
+ IfThenElseStr(len(who) == 0,"", " by " + who),
time.Unix(ts,0).String())
}
func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface{}) {
events := ps.Sub("presence","door","buttons")
+
+ defer func() {
+ if x := recover(); x != nil {
+ fmt.Printf("handleIncomingXMPPStanzas: run time panic: %v", x)
+ ps.Unsub(events, "presence","door","buttons")
+ close(xmpp_presence_events_chan_)
+ }
+ }()
+
var present, locked, shut bool = false, true, true
var who string
button_msg := "The button has been pressed ! Propably someone is bored and in need of company ! ;-)"
present = event.Present
xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeMessage(present, locked, shut, who, event.Ts), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: true}
case DoorCommandEvent:
- who = event.Who
+ 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:
locked = event.Locked
}
func main() {
- var err error
+ var xmpperr error
var bot *r3xmppbot.XmppBot
- bot, xmpp_presence_events_chan_, err = r3xmppbot.NewStartedBot(xmpp_login_.jid, xmpp_login_.pass, xmpp_bot_authstring_, xmpp_state_save_dir_, true)
- if err != nil {
- fmt.Println(err)
- return
- }
- defer bot.StopBot()
+ 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)
defer ps.Shutdown()
//~ defer brn.Shutdown()
- ticker := time.NewTicker(time.Duration(7) * time.Minute)
go EventToWeb(ps)
- go EventToXMPP(ps, xmpp_presence_events_chan_)
- go ReadFromUSocket(presence_socket_path_, newlinequeue)
- for {
- select {
- case e := <-newlinequeue:
- ParseSocketInputLine(e, ps) //, brn)
- case <-ticker.C:
- ps.Pub(TimeTick{time.Now().Unix()}, "publishjson")
- }
- }
+ if xmpperr == nil {
+ defer bot.StopBot()
+ go EventToXMPP(ps, xmpp_presence_events_chan_)
+ } else {
+ fmt.Println(xmpperr)
+ fmt.Println("XMPP Bot disabled")
+ }
+ go ReadFromUSocket(presence_socket_path_, newlinequeue)
+ ticker := time.NewTicker(time.Duration(7) * time.Minute)
+
+ for {
+ select {
+ case e := <-newlinequeue:
+ ParseSocketInputLine(e, ps) //, brn)
+ case <-ticker.C:
+ ps.Pub(TimeTick{time.Now().Unix()}, "publishjson")
+ }
+ }
}