X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-netstatus%2Fr3xmppbot%2Fr3xmppbot.go;h=6740a844d54858c805a6c453952a454b4cd5d50e;hb=762ecd62c9bca5d9a4c9696dcf477d1000a28f42;hp=9963485f678f09bdf11c7126f0e9bb84800ad6f1;hpb=ff98cdc53bc87b9d4f3215df248c188a84cb2fb1;p=svn42.git diff --git a/go/r3-netstatus/r3xmppbot/r3xmppbot.go b/go/r3-netstatus/r3xmppbot/r3xmppbot.go index 9963485..6740a84 100644 --- a/go/r3-netstatus/r3xmppbot/r3xmppbot.go +++ b/go/r3-netstatus/r3xmppbot/r3xmppbot.go @@ -4,7 +4,6 @@ package r3xmppbot import ( xmpp "code.google.com/p/goexmpp" - "log" "crypto/tls" "os" "time" @@ -12,18 +11,6 @@ import ( "path" ) -type StdLogger struct { -} - -func (s *StdLogger) Log(v ...interface{}) { - log.Println(v...) -} - -func (s *StdLogger) Logf(fmt string, v ...interface{}) { - log.Printf(fmt, v...) -} - - func (botdata *XmppBot) makeXMPPMessage(to string, message interface{}, subject interface{}) *xmpp.Message { xmppmsgheader := xmpp.Header{To: to, From: botdata.my_jid_, @@ -143,13 +130,13 @@ type XmppBot struct { func (data RealraumXmppNotifierConfig) saveTo(filepath string) () { fh, err := os.Create(filepath) if err != nil { - log.Println(err) + Syslog_.Println(err) return } defer fh.Close() enc := json.NewEncoder(fh) if err = enc.Encode(&data); err != nil { - log.Println(err) + Syslog_.Println(err) return } } @@ -157,13 +144,13 @@ func (data RealraumXmppNotifierConfig) saveTo(filepath string) () { func (data RealraumXmppNotifierConfig) loadFrom(filepath string) () { fh, err := os.Open(filepath) if err != nil { - log.Println(err) + Syslog_.Println(err) return } defer fh.Close() dec := json.NewDecoder(fh) if err = dec.Decode(&data); err != nil { - log.Println(err) + Syslog_.Println(err) return } for to, jiddata := range data { @@ -172,26 +159,22 @@ func (data RealraumXmppNotifierConfig) loadFrom(filepath string) () { } } - -func init() { - //~ logger := &StdLogger{} - //~ xmpp.Debug = logger - //~ xmpp.Info = logger - //~ xmpp.Warn = logger -} - func (botdata *XmppBot) handleEventsforXMPP(xmppout chan <- xmpp.Stanza, presence_events <- chan interface{}, jabber_events <- chan JabberEvent) { var last_status_msg *string defer func() { if x := recover(); x != nil { - log.Printf("handleEventsforXMPP: run time panic: %v", x) + Syslog_.Printf("handleEventsforXMPP: run time panic: %v", x) + //FIXME: signal that xmpp bot has crashed } + for _ = range(jabber_events) {} //cleanout jabber_events queue }() for { select { - case pe := <-presence_events: + case pe, pe_still_open := <-presence_events: + if ! pe_still_open { return } + Debug_.Printf("handleEventsforXMPP<-presence_events: %T %+v", pe, pe) switch pec := pe.(type) { case xmpp.Stanza: xmppout <- pec @@ -216,14 +199,24 @@ func (botdata *XmppBot) handleEventsforXMPP(xmppout chan <- xmpp.Stanza, presenc } } default: - break + Debug_.Println("handleEventsforXMPP<-presence_events: unknown type received: quitting") + return } - case je := <-jabber_events: + case je, je_still_open := <-jabber_events: + if ! je_still_open { return } + Debug_.Printf("handleEventsforXMPP<-jabber_events: %T %+v", je, je) simple_jid := removeJIDResource(je.JID) jid_data, jid_in_map := botdata.realraum_jids_[simple_jid] + + //send status if requested, even if user never changed any settings and thus is not in map + if last_status_msg != nil && je.StatusNow { + xmppout <- botdata.makeXMPPMessage(je.JID, last_status_msg, nil) + } + if jid_in_map { - if last_status_msg != nil && (je.StatusNow || (! jid_data.Online && je.Online && jid_data.Wants == R3OnlineOnlyWithRecapInfo) ) { + //if R3OnlineOnlyWithRecapInfo, we want a status update when coming online + if last_status_msg != nil && ! jid_data.Online && je.Online && jid_data.Wants == R3OnlineOnlyWithRecapInfo { xmppout <- botdata.makeXMPPMessage(je.JID, last_status_msg, nil) } jid_data.Online = je.Online @@ -249,7 +242,6 @@ func removeJIDResource(jid string) string { func (botdata *XmppBot) isAuthenticated(jid string) bool { authtime, in_map := botdata.jid_lastauthtime_[jid] - //~ log.Println("isAuthenticated", in_map, authtime, time.Now().Unix(), auth_timeout_, time.Now().Unix() - authtime > auth_timeout_) return in_map && time.Now().Unix() - authtime < botdata.auth_timeout_ } @@ -262,8 +254,10 @@ func (botdata *XmppBot) handleIncomingMessageDialog(inmsg xmpp.Message, xmppout if inmsg.Body == nil || inmsg.GetHeader() == nil { return } + if inmsg.Type == "error" || inmsg.Error != nil { + Syslog_.Printf("XMPP Message Error: %s", inmsg.Error.Error()) + } bodytext :=inmsg.Body.Chardata - //~ log.Println("Message Body:", bodytext) if botdata.isAuthenticated(inmsg.GetHeader().From) { switch bodytext { case "on", "*on*": @@ -316,9 +310,9 @@ func (botdata *XmppBot) handleIncomingXMPPStanzas(xmppin <- chan xmpp.Stanza, xm defer func() { if x := recover(); x != nil { - log.Printf("handleIncomingXMPPStanzas: run time panic: %v", x) - close(jabber_events) + Syslog_.Printf("handleIncomingXMPPStanzas: run time panic: %v", x) } + close(jabber_events) }() var incoming_stanza interface{} @@ -327,8 +321,9 @@ func (botdata *XmppBot) handleIncomingXMPPStanzas(xmppin <- chan xmpp.Stanza, xm case *xmpp.Message: botdata.handleIncomingMessageDialog(*stanza, xmppout, jabber_events) case *xmpp.Presence: - if stanza.GetHeader() == nil { - continue + if stanza.GetHeader() == nil { continue } + if stanza.Type == "error" || stanza.Error != nil { + Syslog_.Printf("XMPP Presence Error: %s", stanza.Error.Error()) } switch stanza.GetHeader().Type { case "subscribe": @@ -346,13 +341,22 @@ func (botdata *XmppBot) handleIncomingXMPPStanzas(xmppin <- chan xmpp.Stanza, xm jabber_events <- JabberEvent{stanza.GetHeader().From, true, R3NoChange, false} } case *xmpp.Iq: - if stanza.GetHeader() == nil { - continue + if stanza.GetHeader() == nil { continue } + if stanza.Type == "error" || stanza.Error != nil { + Syslog_.Printf("XMPP Iq Error: %s", stanza.Error.Error()) } + if HandleServerToClientPing(stanza, xmppout) {continue} //if true then routine handled it and we can continue + Debug_.Printf("Unhandled Iq: %s", stanza) } } } +func init() { + //~ xmpp.Debug = &XMPPDebugLogger{} + xmpp.Info = &XMPPDebugLogger{} + xmpp.Warn = &XMPPLogger{} +} + func NewStartedBot(loginjid, loginpwd, password, state_save_dir string, insecuretls bool) (*XmppBot, chan interface{}, error) { var err error botdata := new(XmppBot) @@ -367,13 +371,6 @@ func NewStartedBot(loginjid, loginpwd, password, state_save_dir string, insecure botdata.config_file_ = path.Join(state_save_dir, "r3xmpp."+removeJIDResource(loginjid)+".json") - //~ log.Println(botdata.config_file_) - - //~ logger := &StdLogger{} - //~ xmpp.Debug = logger - //~ xmpp.Info = logger - //~ xmpp.Warn = logger - xmpp.TlsConfig = tls.Config{InsecureSkipVerify: insecuretls} botdata.realraum_jids_.loadFrom(botdata.config_file_) @@ -381,18 +378,19 @@ func NewStartedBot(loginjid, loginpwd, password, state_save_dir string, insecure client_jid.Set(botdata.my_jid_) botdata.xmppclient_, err = xmpp.NewClient(client_jid, botdata.my_login_password_, nil) if err != nil { - log.Println("Error connecting to xmpp server", err) + Syslog_.Println("Error connecting to xmpp server", err) return nil, nil, err } err = botdata.xmppclient_.StartSession(true, &xmpp.Presence{}) if err != nil { - log.Println("'Error StartSession:", err) + Syslog_.Println("'Error StartSession:", err) return nil, nil, err } roster := xmpp.Roster(botdata.xmppclient_) for _, entry := range roster { + Debug_.Print(entry) if entry.Subscription == "from" { botdata.xmppclient_.Out <- botdata.makeXMPPPresence(entry.Jid, "subscribe", "","") } @@ -413,6 +411,7 @@ func NewStartedBot(loginjid, loginpwd, password, state_save_dir string, insecure } func (botdata *XmppBot) StopBot() { + Syslog_.Println("Stopping XMPP Bot") if botdata.xmppclient_ != nil { close(botdata.xmppclient_.Out) } @@ -420,4 +419,7 @@ func (botdata *XmppBot) StopBot() { *botdata.presence_events_ <- false close(*botdata.presence_events_) } + botdata.config_file_ = "" + botdata.realraum_jids_ = nil + botdata.xmppclient_ = nil }