projects
/
svn42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better logging in r3-netstatus
[svn42.git]
/
go
/
r3-netstatus
/
webstatus.go
diff --git
a/go/r3-netstatus/webstatus.go
b/go/r3-netstatus/webstatus.go
index
d303b13
..
53ff92d
100644
(file)
--- a/
go/r3-netstatus/webstatus.go
+++ b/
go/r3-netstatus/webstatus.go
@@
-1,3
+1,5
@@
+// (c) Bernhard Tittelbach, 2013
+
package main
import (
package main
import (
@@
-6,8
+8,8
@@
import (
"regexp"
"net/http"
"net/url"
"regexp"
"net/http"
"net/url"
- "log"
"time"
"time"
+ r3events "svn.spreadspace.org/realraum/go.svn/r3-eventbroker_zmq/r3events"
)
)
@@
-49,7
+51,7
@@
func publishStateToWeb() {
updateStatusString()
jsondata_b, err := spaceapidata.MakeJSON()
if err != nil {
updateStatusString()
jsondata_b, err := spaceapidata.MakeJSON()
if err != nil {
- log.Println("Error:", err)
+ Syslog_.Println("Error:", err)
return
}
//jsondata_b := re_querystresc_.ReplaceAllFunc(jsondata_b, func(in []byte) []byte {
return
}
//jsondata_b := re_querystresc_.ReplaceAllFunc(jsondata_b, func(in []byte) []byte {
@@
-61,7
+63,7
@@
func publishStateToWeb() {
jsondata := url.QueryEscape(string(jsondata_b))
resp, err := http.Get("http://www.realraum.at/cgi/status.cgi?pass=jako16&set=" + jsondata)
if err != nil {
jsondata := url.QueryEscape(string(jsondata_b))
resp, err := http.Get("http://www.realraum.at/cgi/status.cgi?pass=jako16&set=" + jsondata)
if err != nil {
- log.Println("Error publishing realraum info", err)
+ Syslog_.Println("Error publishing realraum info", err)
return
}
resp.Body.Close()
return
}
resp.Body.Close()
@@
-71,23
+73,26
@@
func EventToWeb(ps *pubsub.PubSub) {
events := ps.Sub("presence","door","sensors","buttons","updateinterval")
for eventinterface := range(events) {
events := ps.Sub("presence","door","sensors","buttons","updateinterval")
for eventinterface := range(events) {
+ //Debug_.Printf("EventToWeb: %s" , eventinterface)
switch event := eventinterface.(type) {
switch event := eventinterface.(type) {
- case TimeTick:
+ case r3events.TimeTick:
publishStateToWeb()
publishStateToWeb()
- case PresenceUpdate:
+ case r3events.PresenceUpdate:
statusstate.present = event.Present
publishStateToWeb()
statusstate.present = event.Present
publishStateToWeb()
- case DoorStatusUpdate:
- spaceapidata.MergeInSensor(spaceapi.MakeDoorLockSensor("TorwaechterLock", "Türschloß", event.Locked))
+ case r3events.DoorAjarUpdate:
spaceapidata.MergeInSensor(spaceapi.MakeDoorLockSensor("TorwaechterAjarSensor", "Türkontakt", event.Shut))
publishStateToWeb()
spaceapidata.MergeInSensor(spaceapi.MakeDoorLockSensor("TorwaechterAjarSensor", "Türkontakt", event.Shut))
publishStateToWeb()
- case ButtonPressUpdate:
+ case r3events.DoorLockUpdate:
+ spaceapidata.MergeInSensor(spaceapi.MakeDoorLockSensor("TorwaechterLock", "Türschloß", event.Locked))
+ publishStateToWeb()
+ case r3events.BoreDoomButtonPressEvent:
statusstate.buttonpress_until = event.Ts + 3600
statusstate.buttonpress_until = event.Ts + 3600
- spaceapidata.AddSpaceEvent("PanicButton", "check-in", "The button has been pressed")
+ spaceapidata.AddSpaceEvent("BoreDOOMButton", "check-in", "The button has been pressed")
publishStateToWeb()
publishStateToWeb()
- case TempSensorUpdate:
+ case r3events.TempSensorUpdate:
spaceapidata.MergeInSensor(spaceapi.MakeTempCSensor("Temp0","Decke", event.Value))
spaceapidata.MergeInSensor(spaceapi.MakeTempCSensor("Temp0","Decke", event.Value))
- case IlluminationSensorUpdate:
+ case r3events.IlluminationSensorUpdate:
spaceapidata.MergeInSensor(spaceapi.MakeIlluminationSensor("Photodiode","Decke","1024V/5V", event.Value))
}
}
spaceapidata.MergeInSensor(spaceapi.MakeIlluminationSensor("Photodiode","Decke","1024V/5V", event.Value))
}
}