X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-netstatus%2Fmain.go;h=0a4b0c9c986b17d5bb1b221773fcc469356463e2;hb=52e539857287337cd45591c4a1a0023600bcbb92;hp=b65e96e8c01f9b04c379134afbf654e384a7949d;hpb=b7182b7f1d5dae86d81310beaa6ce6d693696572;p=svn42.git

diff --git a/go/r3-netstatus/main.go b/go/r3-netstatus/main.go
index b65e96e..0a4b0c9 100644
--- a/go/r3-netstatus/main.go
+++ b/go/r3-netstatus/main.go
@@ -42,8 +42,6 @@ func init() {
     flag.BoolVar(&enable_syslog_, "syslog", false, "enable logging to syslog")
     flag.BoolVar(&enable_debug_, "debug", false, "enable debug logging")
     flag.Parse()
-    if enable_syslog_ { LogEnableSyslog(); r3xmppbot.LogEnableSyslog() }
-    if enable_debug_ { LogEnableDebuglog(); r3xmppbot.LogEnableDebuglog() }
 }
 
 //-------
@@ -119,7 +117,17 @@ func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface
 	}
 }
 
+func ParseZMQr3Event(lines [][]byte, ps *pubsub.PubSub) {
+    evnt, pubsubcat, err := r3events.UnmarshalByteByte2Event(lines)
+    if err != nil { return }
+    ps.Pub(evnt, pubsubcat)
+}
+
 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()}
@@ -143,7 +151,7 @@ func main() {
     } else {
         fmt.Println(xmpperr)
         fmt.Println("XMPP Bot disabled")
-        Syslog_.Printf("XMPP Bot disabled due to error: %s", xmpperr)
+        Syslog_.Printf("XMPP Bot disabled due to error: %s", xmpperr.Error())
     }
 
     // --- get update on most recent events ---