X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-netstatus%2Fmain.go;h=563f94ddd13f31be64816d581f6e9a0bc4508c73;hb=8167115aeab2a01a4fc84fecf4fc71a7749577a2;hp=0a4b0c9c986b17d5bb1b221773fcc469356463e2;hpb=52e539857287337cd45591c4a1a0023600bcbb92;p=svn42.git diff --git a/go/r3-netstatus/main.go b/go/r3-netstatus/main.go index 0a4b0c9..563f94d 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 { @@ -40,7 +40,7 @@ func init() { 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.BoolVar(&enable_debug_, "debug", false, "enable debug output") flag.Parse() } @@ -64,7 +64,7 @@ func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface defer func() { if x := recover(); x != nil { - Debug_.Printf("handleIncomingXMPPStanzas: run time panic: %v", x) + Syslog_.Printf("handleIncomingXMPPStanzas: run time panic: %v", x) ps.Unsub(events, "presence","door","buttons","updateinterval") close(xmpp_presence_events_chan_) } @@ -81,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) { - Debug_.Println("event2xmpp", eventinterface) + Debug_.Printf("event2xmpp: %T %+v", eventinterface, eventinterface) switch event := eventinterface.(type) { case r3events.PresenceUpdate: present = event.Present @@ -119,6 +119,7 @@ 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) }