X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fdoor_daemon_zmq%2Fmain.go;h=84db84875bfdaf606e0514493b4dfceac2204426;hb=e5f623a144f65281490dbcf9757557e0f14a9402;hp=e295c4ed551b6c73188fe6decba0a86d1e6a7a55;hpb=441541ad3b5df76929e4d8a5ad8781e6b73aac8d;p=svn42.git

diff --git a/go/door_daemon_zmq/main.go b/go/door_daemon_zmq/main.go
index e295c4e..84db848 100644
--- a/go/door_daemon_zmq/main.go
+++ b/go/door_daemon_zmq/main.go
@@ -3,12 +3,9 @@
 package main
 
 import (
-    "fmt"
     "os"
     "flag"
     "time"
-    "log/syslog"
-    "log"
 )
 
 //~ func StringArrayToByteArray(ss []string) [][]byte {
@@ -25,47 +22,36 @@ var (
     cmd_port_ string
     pub_port_ string
     door_tty_path_ string
-    use_syslog_ bool
-    syslog_ *log.Logger
+    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", "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.Usage = usage
+    flag.BoolVar(&enable_syslog_, "syslog", false, "enable logging to syslog")
+    flag.BoolVar(&enable_debug_, "debug", false, "enable debug output")
     flag.Parse()
 }
 
 func main() {
+    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(door_tty_path_)
+    serial_wr, serial_rd, err := OpenAndHandleSerial(door_tty_path_, 0)
     defer close(serial_wr)
     if err != nil {
         panic(err)
     }
 
-    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")
-    }
-
-    //~ 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)
@@ -73,15 +59,15 @@ func main() {
         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 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")
+                    Syslog_.Print("serial device disappeared, exiting")
                     os.Exit(1)
                 }
             case tv, timeout_notclosed := <- timeout_chan:
@@ -91,10 +77,19 @@ func main() {
                 }
             case incoming_request, ic_notclosed := <- cmd_chans.In():
                 if ! ic_notclosed {
-                    syslog_.Print("zmq socket died, exiting")
+                    Syslog_.Print("zmq socket died, exiting")
                     os.Exit(2)
                 }
-                if syslog_ != nil { syslog_.Printf("%s",incoming_request) }
+                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 {
                     out_msg := [][]byte{[]byte("ERROR"), []byte(err.Error())}
                     cmd_chans.Out() <- out_msg