X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fdoor_daemon_zmq%2Fmain.go;h=32096d740a899ac20849166528668330347da4a5;hb=8a9d96086ca3e1bf73001f8fdd32c5431668baf3;hp=d943d8ddc3384075c577cf222b2a8e4a92fa825d;hpb=5f6f582835748fcc15616c11eaa76bac358e9fc2;p=svn42.git

diff --git a/go/door_daemon_zmq/main.go b/go/door_daemon_zmq/main.go
index d943d8d..32096d7 100644
--- a/go/door_daemon_zmq/main.go
+++ b/go/door_daemon_zmq/main.go
@@ -3,10 +3,9 @@
 package main
 
 import (
-    "fmt"
     "os"
     "flag"
-    //~ "log"
+    "time"
 )
 
 //~ func StringArrayToByteArray(ss []string) [][]byte {
@@ -22,68 +21,82 @@ import (
 var (
     cmd_port_ string
     pub_port_ string
+    door_tty_path_ string
+    enable_syslog_ bool
+    enable_debug_ bool
 )
 
-func usage() {
-    fmt.Fprintf(os.Stderr, "Usage: door_daemon_0mq <door tty device>\n")
-    flag.PrintDefaults()
-}
-
 func init() {
-    flag.StringVar(&cmd_port_, "cmdport", "tcp://127.0.01:3232", "zmq command socket path")
-    flag.StringVar(&pub_port_, "pubport", "pgm://233.252.1.42:4242", "zmq public/listen socket path")
-    flag.Usage = usage
+    flag.StringVar(&cmd_port_, "cmdport", "ipc:///run/tuer/door_cmd.ipc", "zmq command socket path")
+    flag.StringVar(&pub_port_, "pubport", "tcp://*:4242", "zmq public/listen socket path")
+    flag.StringVar(&door_tty_path_, "device", "/dev/door", "door tty device path")
+    flag.BoolVar(&enable_syslog_, "syslog", false, "enable logging to syslog")
+    flag.BoolVar(&enable_debug_, "debug", false, "enable debug output")
     flag.Parse()
 }
 
 func main() {
-    args := flag.Args()
-    if len(args) < 1 {
-        fmt.Fprintf(os.Stderr, "Input file is missing!\n");
-        usage()
-        os.Exit(1);
-    }
+    if enable_syslog_ { LogEnableSyslog()}
+    if enable_debug_ { LogEnableDebuglog()}
+    Syslog_.Print("started")
+    defer Syslog_.Print("exiting")
 
     zmqctx, cmd_chans, pub_chans := ZmqsInit(cmd_port_, pub_port_)
     defer cmd_chans.Close()
     defer pub_chans.Close()
     defer zmqctx.Close()
 
-    serial_wr, serial_rd, err := OpenAndHandleSerial(args[0])
+    serial_wr, serial_rd, err := OpenAndHandleSerial(door_tty_path_)
     defer close(serial_wr)
     if err != nil {
         panic(err)
     }
 
-    //~ serial_wr <- "f"
-    //~ firmware_version := <- serial_rd
-    //~ log.Print("Firmware version:", firmware_version)
     var next_incoming_serial_is_client_reply bool
+    timeout_chan := make(chan bool)
+    defer close(timeout_chan)
     for {
         select {
             case incoming_ser_line, is_notclosed := <- serial_rd:
                 if is_notclosed {
+                    //~ if Syslog_ != nil { Syslog_.Print(ByteArrayToString(incoming_ser_line)) }
+                    if Syslog_ != nil { Syslog_.Printf("%s",incoming_ser_line) }
                     if next_incoming_serial_is_client_reply {
                         next_incoming_serial_is_client_reply = false
                         cmd_chans.Out() <- incoming_ser_line
                     }
                     pub_chans.Out() <- incoming_ser_line
                 } else {
+                    Syslog_.Print("serial device disappeared, exiting")
                     os.Exit(1)
                 }
+            case tv, timeout_notclosed := <- timeout_chan:
+                if timeout_notclosed && tv && next_incoming_serial_is_client_reply {
+                        next_incoming_serial_is_client_reply = false
+                        cmd_chans.Out() <- [][]byte{[]byte("ERROR"), []byte("No reply from firmware")}
+                }
             case incoming_request, ic_notclosed := <- cmd_chans.In():
-                if ! ic_notclosed {os.Exit(2)}
-                //~ log.Print(incoming_request)
+                if ! ic_notclosed {
+                    Syslog_.Print("zmq socket died, exiting")
+                    os.Exit(2)
+                }
+                if string(incoming_request[0]) == "log" {
+                    if len(incoming_request) < 2 {
+                        cmd_chans.Out() <- [][]byte{[]byte("ERROR"), []byte("argument missing")}
+                        continue
+                    }
+                    Syslog_.Printf("Log: %s",incoming_request[1:])
+                    cmd_chans.Out() <- [][]byte{[]byte("Ok")}
+                    continue
+                }
+                Syslog_.Printf("%s",incoming_request)
                  if err := HandleCommand(incoming_request, serial_wr, serial_rd); err != nil {
-                    //~ log.Print(err)
                     out_msg := [][]byte{[]byte("ERROR"), []byte(err.Error())}
                     cmd_chans.Out() <- out_msg
-                    //~ log.Print("sent error")
                  } else {
-                    //~ log.Print(reply)
                     pub_chans.Out() <- incoming_request
                     next_incoming_serial_is_client_reply = true
-                    //~ log.Print("sent reply")
+                    go func(){time.Sleep(3*time.Second); timeout_chan <- true;}()
                  }
         }
     }