better logging

[svn42.git] / go / r3-eventbroker_zmq / sockettoevent.go

diff --git a/go/r3-eventbroker_zmq/sockettoevent.go b/go/r3-eventbroker_zmq/sockettoevent.go
index 6c245b4..fbd74d5 100644 (file)
--- a/go/r3-eventbroker_zmq/sockettoevent.go
+++ b/go/r3-eventbroker_zmq/sockettoevent.go
@@ -9,7 +9,6 @@ import (
     //~ "./brain"
     pubsub "github.com/tuxychandru/pubsub"
     zmq "github.com/vaughan0/go-zmq"
-    "log"
     "./r3events"
     )
 
@@ -30,18 +29,18 @@ var (
 func parseSocketInputLine_State(lines [][]byte, ps *pubsub.PubSub, ts int64) {
     switch string(lines[0]) {
         case "closed":
-            ps.Pub(r3events.DoorLockUpdate{0, true, ts}, "door")
+            ps.Pub(r3events.DoorLockUpdate{true, ts}, "door")
         case "opened":
-            ps.Pub(r3events.DoorLockUpdate{0, false, ts}, "door")
+            ps.Pub(r3events.DoorLockUpdate{false, ts}, "door")
         case "manual":   //movement
         case "error":
         case "reset":
-            ps.Pub(r3events.DoorLockUpdate{0, true, ts}, "door")
+            ps.Pub(r3events.DoorLockUpdate{true, ts}, "door")
         case "timeout":   //after open | after close
         case "opening":
         case "closing":
         default:
-            if Syslog_ != nil {Syslog_.Print("parseSocketInputLine_State: Unexpected State:", lines)}
+            Syslog_.Print("parseSocketInputLine_State: Unexpected State:", lines)
     }
 }
 
@@ -49,15 +48,15 @@ func parseSocketInputLine_State(lines [][]byte, ps *pubsub.PubSub, ts int64) {
 func ParseSocketInputLine(lines [][]byte, ps *pubsub.PubSub, keylookup_socket *zmq.Socket) { //, brn *brain.Brain) {
     ts := time.Now().Unix()
     if len(lines) < 1 { return }
-    log.Printf("ParseSocketInputLine: %s %s",string(lines[0]), lines[1:])
+    Debug_.Printf("ParseSocketInputLine: %s %s",string(lines[0]), lines[1:])
     switch string(lines[0]) {
         case "State:":
             if len(lines) < 2 { return }
             parseSocketInputLine_State(lines[1:], ps, ts)
         case "Status:":
             if len(lines) < 3 { return }
-            ps.Pub(r3events.DoorLockUpdate{0, string(lines[1]) == "closed,", ts}, "door")
-            ps.Pub(r3events.DoorAjarUpdate{0, string(lines[len(lines)-1]) == "shut", ts}, "door")
+            ps.Pub(r3events.DoorLockUpdate{string(lines[1]) == "closed,", ts}, "door")
+            ps.Pub(r3events.DoorAjarUpdate{string(lines[len(lines)-1]) == "shut", ts}, "door")
         case "Info(card):":
             if len(lines) < 3 { return }
             if string(lines[2]) != "found" { return }
@@ -74,7 +73,7 @@ func ParseSocketInputLine(lines [][]byte, ps *pubsub.PubSub, keylookup_socket *z
             }
         case "Info(ajar):":
             if len(lines) < 5 { return }
-            ps.Pub(r3events.DoorAjarUpdate{0, string(lines[4]) == "shut", ts}, "door")
+            ps.Pub(r3events.DoorAjarUpdate{string(lines[4]) == "shut", ts}, "door")
         case "open", "close", "toggle", "reset":
             ps.Pub(r3events.DoorCommandEvent{string(lines[0]), string(lines[1]), string(lines[2]), ts},"doorcmd")
         case "photo0":
@@ -91,7 +90,7 @@ func ParseSocketInputLine(lines [][]byte, ps *pubsub.PubSub, keylookup_socket *z
             //try decode r3event
             evnt, err := r3events.UnmarshalByteByte2Event(lines)
             if err == nil {ps.Pub(evnt, "movement")}
-        case "ButtonPressUpdate" :
+        case "BoreDoomButtonPressEvent" :
             //try decode r3event
             evnt, err := r3events.UnmarshalByteByte2Event(lines)
             if err == nil {ps.Pub(evnt, "buttons")}
@@ -110,7 +109,7 @@ func MakeTimeTick(ps *pubsub.PubSub) {
     //~ match_photo := re_photo_.FindStringSubmatch(line)
        //~ if match_button != nil {
         //~ // brn.Oboite("button0", ts)
-        //~ ps.Pub(ButtonPressUpdate{0, ts}, "buttons")
+        //~ ps.Pub(BoreDoomButtonPressEvent{0, ts}, "buttons")
        //~ } else if match_temp != nil {
                //~ newtemp, err := strconv.ParseFloat((match_temp[1]), 32)
                //~ if err == nil {