X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fdoor_daemon_zmq%2Fmain.go;h=606c3646794af980c393aad0df55b92f565374cb;hb=59b5b0d11e44853e93a5a66dc66133254f844753;hp=9fa453160a1c9f004321cb7f461321ce299c3a44;hpb=05f5975f0266e628e89cf0f60f84f47d43136747;p=svn42.git

diff --git a/go/door_daemon_zmq/main.go b/go/door_daemon_zmq/main.go
index 9fa4531..606c364 100644
--- a/go/door_daemon_zmq/main.go
+++ b/go/door_daemon_zmq/main.go
@@ -6,6 +6,8 @@ import (
     "fmt"
     "os"
     "flag"
+    "time"
+    "log/syslog"
     "log"
 )
 
@@ -22,47 +24,92 @@ import (
 var (
     cmd_port_ string
     pub_port_ string
+    door_tty_path_ string
+    use_syslog_ bool
+    Syslog_ *log.Logger
 )
 
-func usage() {
-    fmt.Fprintf(os.Stderr, "Usage: door_daemon_0mq <door tty device>\n")
-    flag.PrintDefaults()
-}
-
 func init() {
-    flag.StringVar(&cmd_port_, "cmdport", "tcp://localhost:5555", "zmq command socket path")
-    flag.StringVar(&pub_port_, "pubport", "gmp://*:6666", "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(&use_syslog_, "syslog", false, "log to syslog local1 facility")
     flag.Parse()
 }
 
 func main() {
-    args := flag.Args()
-    if len(args) < 1 {
-        fmt.Fprintf(os.Stderr, "Input file is missing!\n");
-        usage()
-        os.Exit(1);
-    }
+    zmqctx, cmd_chans, pub_chans := ZmqsInit(cmd_port_, pub_port_)
+    defer cmd_chans.Close()
+    defer pub_chans.Close()
+    defer zmqctx.Close()
 
-    cmd_chans, pub_chans := ZmqsInit(cmd_port_, pub_port_)
-
-    serial_wr, serial_rd, err := OpenAndHandleSerial(args[0], pub_chans.Out())
+    serial_wr, serial_rd, err := OpenAndHandleSerial(door_tty_path_)
+    defer close(serial_wr)
     if err != nil {
-        close(serial_wr)
         panic(err)
     }
 
-    serial_wr <- "f"
-    firmware_version := <- serial_rd
-    log.Print("Firmware version:", firmware_version)
+    if use_syslog_ {
+        var logerr error
+        Syslog_, logerr = syslog.NewLogger(syslog.LOG_INFO | syslog.LOG_LOCAL1, 0)
+        if logerr != nil { panic(logerr) }
+        Syslog_.Print("started")
+        defer Syslog_.Print("exiting")
+    }
 
-    for incoming_request := range cmd_chans.In() {
-        reply, err := HandleCommand(incoming_request, pub_chans.Out(), serial_wr, serial_rd)
-         if err != nil {
-            cmd_chans.Out() <- [][]byte{[]byte("ERROR"), []byte(err.Error())}
-            log.Print(err)
-         } else {
-            cmd_chans.Out() <- reply
-         }
+    //~ 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 {
+                    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
+                    }
+                    if Syslog_ == nil {
+                        cmd_chans.Out() <- [][]byte{[]byte("ERROR"), []byte("syslog logging not enabled")}
+                        continue
+                    }
+                    Syslog_.Printf("Log: %s",incoming_request[1:])
+                    cmd_chans.Out() <- [][]byte{[]byte("Ok")}
+                    continue
+                }
+                if Syslog_ != nil { Syslog_.Printf("%s",incoming_request) }
+                 if err := HandleCommand(incoming_request, serial_wr, serial_rd); err != nil {
+                    out_msg := [][]byte{[]byte("ERROR"), []byte(err.Error())}
+                    cmd_chans.Out() <- out_msg
+                 } else {
+                    pub_chans.Out() <- incoming_request
+                    next_incoming_serial_is_client_reply = true
+                    go func(){time.Sleep(3*time.Second); timeout_chan <- true;}()
+                 }
+        }
     }
 }