projects
/
svn42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
date in graph
[svn42.git]
/
go
/
r3-netstatus
/
main.go
diff --git
a/go/r3-netstatus/main.go
b/go/r3-netstatus/main.go
index
ff94189
..
563f94d
100644
(file)
--- a/
go/r3-netstatus/main.go
+++ b/
go/r3-netstatus/main.go
@@
-9,7
+9,7
@@
import (
"time"
"fmt"
//~ "./brain"
"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 {
)
type SpaceState struct {
@@
-26,6
+26,8
@@
var (
xmpp_state_save_dir_ string
r3eventssub_port_ string
button_press_timeout_ int64 = 3600
xmpp_state_save_dir_ string
r3eventssub_port_ string
button_press_timeout_ int64 = 3600
+ brain_connect_addr_ string
+ enable_syslog_, enable_debug_ bool
)
//-------
)
//-------
@@
-36,6
+38,9
@@
func init() {
flag.StringVar(&xmpp_bot_authstring_, "xbotauth", "", "String that user use to authenticate themselves to the bot")
flag.StringVar(&xmpp_state_save_dir_,"xstatedir","/flash/var/lib/r3netstatus/", "Directory to save XMPP bot state in")
flag.StringVar(&r3eventssub_port_, "eventsubport", "tcp://wuzzler.realraum.at:4244", "zmq address to subscribe r3events")
flag.StringVar(&xmpp_bot_authstring_, "xbotauth", "", "String that user use to authenticate themselves to the bot")
flag.StringVar(&xmpp_state_save_dir_,"xstatedir","/flash/var/lib/r3netstatus/", "Directory to save XMPP bot state in")
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 output")
flag.Parse()
}
flag.Parse()
}
@@
-59,7
+64,7
@@
func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface
defer func() {
if x := recover(); x != nil {
defer func() {
if x := recover(); x != nil {
- fmt.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_)
}
ps.Unsub(events, "presence","door","buttons","updateinterval")
close(xmpp_presence_events_chan_)
}
@@
-68,7
+73,7
@@
func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface
var present, locked, shut bool = false, true, true
var last_buttonpress int64 = 0
var who string
var present, locked, shut bool = false, true, true
var last_buttonpress int64 = 0
var who string
- button_msg := "The button has been pressed ! Propably someone is bored and in need of company ! ;-)"
+ button_msg := "Dooom ! The button has been pressed ! Propably someone is bored and in need of company ! ;-)"
present_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowOnline,"Somebody is present"}
notpresent_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowNotAvailabe,"Nobody is here"}
button_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowFreeForChat, "The button has been pressed :-)"}
present_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowOnline,"Somebody is present"}
notpresent_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowNotAvailabe,"Nobody is here"}
button_status := r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowFreeForChat, "The button has been pressed :-)"}
@@
-76,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) {
xmpp_presence_events_chan_ <- r3xmppbot.XMPPStatusEvent{r3xmppbot.ShowNotAvailabe, "Nobody is here"}
for eventinterface := range(events) {
- fmt.Println("event2xmpp", eventinterface)
+ Debug_.Printf("event2xmpp: %T %+v", eventinterface, eventinterface)
switch event := eventinterface.(type) {
case r3events.PresenceUpdate:
present = event.Present
switch event := eventinterface.(type) {
case r3events.PresenceUpdate:
present = event.Present
@@
-99,7
+104,7
@@
func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface
case r3events.DoorAjarUpdate:
shut = event.Shut
xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeMessage(present, locked, shut, who, event.Ts), DistributeLevel: r3xmppbot.R3DebugInfo, RememberAsStatus: true}
case r3events.DoorAjarUpdate:
shut = event.Shut
xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeMessage(present, locked, shut, who, event.Ts), DistributeLevel: r3xmppbot.R3DebugInfo, RememberAsStatus: true}
- case r3events.ButtonPressUpdate:
+ case r3events.BoreDoomButtonPressEvent:
xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: button_msg, DistributeLevel: r3xmppbot.R3OnlineOnlyInfo}
xmpp_presence_events_chan_ <- button_status
last_buttonpress = event.Ts
xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: button_msg, DistributeLevel: r3xmppbot.R3OnlineOnlyInfo}
xmpp_presence_events_chan_ <- button_status
last_buttonpress = event.Ts
@@
-112,7
+117,18
@@
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)
+}
+
func main() {
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()}
zmqctx, zmqsub := ZmqsInit(r3eventssub_port_)
defer zmqctx.Close()
if zmqsub != nil {defer zmqsub.Close()}
@@
-123,6
+139,7
@@
func main() {
var xmpperr error
var bot *r3xmppbot.XmppBot
bot, xmpp_presence_events_chan_, xmpperr = r3xmppbot.NewStartedBot(xmpp_login_.jid, xmpp_login_.pass, xmpp_bot_authstring_, xmpp_state_save_dir_, true)
var xmpperr error
var bot *r3xmppbot.XmppBot
bot, xmpp_presence_events_chan_, xmpperr = r3xmppbot.NewStartedBot(xmpp_login_.jid, xmpp_login_.pass, xmpp_bot_authstring_, xmpp_state_save_dir_, true)
+
ps := pubsub.New(1)
defer ps.Shutdown()
//~ brn := brain.New()
ps := pubsub.New(1)
defer ps.Shutdown()
//~ brn := brain.New()
@@
-135,10
+152,17
@@
func main() {
} else {
fmt.Println(xmpperr)
fmt.Println("XMPP Bot disabled")
} else {
fmt.Println(xmpperr)
fmt.Println("XMPP Bot disabled")
+ Syslog_.Printf("XMPP Bot disabled due to error: %s", xmpperr.Error())
}
}
- ticker := time.NewTicker(time.Duration(7) * time.Minute)
+ // --- get update on most recent events ---
+ answ := ZmqsAskQuestionsAndClose(zmqctx, brain_connect_addr_, [][][]byte{[][]byte{[]byte("DoorLockUpdate")}, [][]byte{[]byte("DoorAjarUpdate")}, [][]byte{[]byte("DoorCommandEvent")}, [][]byte{[]byte("PresenceUpdate")}, [][]byte{[]byte("IlluminationSensorUpdate")}, [][]byte{[]byte("TempSensorUpdate")}})
+ for _, a := range(answ) {
+ ParseZMQr3Event(a, ps)
+ }
+ // --- receive and distribute events ---
+ ticker := time.NewTicker(time.Duration(7) * time.Minute)
for {
select {
case e := <-zmqsub.In():
for {
select {
case e := <-zmqsub.In():