X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fdoor_client_zmq%2Fmain.go;h=193c643f3b0e5b07f67c285260ec54226d04371e;hb=02dbcb404955284e9849d80ea56e9c5e02534d40;hp=4db2f1e099de09f61ebc52d201a3023a558b8548;hpb=342b4f2bf36cb16ff48cb894a80ffd8eac734086;p=svn42.git

diff --git a/go/door_client_zmq/main.go b/go/door_client_zmq/main.go
index 4db2f1e..193c643 100644
--- a/go/door_client_zmq/main.go
+++ b/go/door_client_zmq/main.go
@@ -25,8 +25,8 @@ func usage() {
 }
 
 func init() {
-    flag.StringVar(&cmd_port_, "cmdport", "tcp://localhost:5555", "zmq command socket path")
-    flag.StringVar(&sub_port_, "pubport", "gmp://*:6666", "zmq subscribe/listen socket path")
+    flag.StringVar(&cmd_port_, "cmdport", "tcp://127.0.0.1:3232", "zmq command socket path")
+    flag.StringVar(&sub_port_, "pubport", "pgm://233.252.1.42:4242", "zmq subscribe/listen socket path")
     flag.Usage = usage
     flag.Parse()
 }
@@ -34,13 +34,14 @@ func init() {
 func LineReader(out chan <- [][]byte, stdin * os.File) {
     linescanner := bufio.NewScanner(stdin)
     linescanner.Split(bufio.ScanLines)
+    defer close(out)
     for linescanner.Scan() {
         if err := linescanner.Err(); err != nil {
             log.Print(err)
-            close(out)
             return
         }
-        text := bytes.Fields([]byte(linescanner.Text()))
+        //text := bytes.Fields(linescanner.Bytes()) //this returns a slice (aka pointer, no array deep-copy here)
+        text := bytes.Fields([]byte(linescanner.Text())) //this allocates a string and slices it -> no race-condition with overwriting any data
         if len(text) == 0 {
             continue
         }
@@ -48,7 +49,12 @@ func LineReader(out chan <- [][]byte, stdin * os.File) {
     }
 }
 
-func main() { 
+func ByteArrayToString(bb [][]byte) string {
+    b := bytes.Join(bb, []byte(" "))
+    return string(b)
+}
+
+func main() {
     cmd_chans, sub_chans := ZmqsInit(cmd_port_, sub_port_)
     defer cmd_chans.Close()
     defer sub_chans.Close()
@@ -58,7 +64,7 @@ func main() {
     user_input_chan := make(chan [][]byte, 1)
     go LineReader(user_input_chan, os.Stdin)
     defer os.Stdin.Close()
-    
+
     for {
         select {
         case input, input_open := (<- user_input_chan):
@@ -69,16 +75,21 @@ func main() {
                         listen = true
                         fmt.Println("Now listening")
                     case "quit":
-                        break
+                        os.Exit(0)
                     default:
                         ignore_next = true
                         cmd_chans.Out() <- input
-                        fmt.Println( <- cmd_chans.In())
+                        log.Print("input sent")
+                        reply := <- cmd_chans.In()
+                        log.Print("reply received")
+                        fmt.Println(ByteArrayToString(reply))
                 }
             } else {
-                break
+                os.Exit(0)
             }
         case pubsubstuff := <- sub_chans.In():
+            log.Print("pubsubstuff",pubsubstuff)
+            if len(pubsubstuff) == 0 { continue}
             if ignore_next {
                 ignore_next = false
                 continue