status cmd, nicer help, longer auth timeout

[svn42.git] / r3-netstatus / main.go

diff --git a/r3-netstatus/main.go b/r3-netstatus/main.go
index abec0c1..f7828b9 100644 (file)
--- a/r3-netstatus/main.go
+++ b/r3-netstatus/main.go
@@ -39,7 +39,7 @@ func init() {
 
 func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface{}) {
     events := ps.Sub("presence","door","buttons")
-    var present, locked, shut bool
+    var present, locked, shut bool = false, true, true
     var who string = "Unknown"
 
     for eventinterface := range(events) {
@@ -70,7 +70,7 @@ func main() {
     }
     defer bot.StopBot()
     
-    newlinequeue := make(chan string)
+    newlinequeue := make(chan string, 1)
     ps := pubsub.New(1)
     //~ brn := brain.New()
     defer close(newlinequeue)
@@ -78,9 +78,9 @@ func main() {
     //~ defer brn.Shutdown()
     
        ticker := time.NewTicker(time.Duration(7) * time.Minute)
-       go ReadFromUSocket(presence_socket_path_, newlinequeue)
     go EventToWeb(ps)
     go EventToXMPP(ps, xmpp_presence_events_chan_)
+       go ReadFromUSocket(presence_socket_path_, newlinequeue)
        for {
                select {
                case e := <-newlinequeue: