X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fdoor_client_zmq%2Fzeromq.go;h=cde60c9ee06c644ba81cbc0264ecdaa83cdfaab3;hb=a87c91b7d4544703879b7ef6e472b863765e3949;hp=c91b7bd6cbc581eda4944f1fe1615c4d5ecbf463;hpb=e021d7de474ab4755e8081e3009c328fd7d07c09;p=svn42.git

diff --git a/go/door_client_zmq/zeromq.go b/go/door_client_zmq/zeromq.go
index c91b7bd..cde60c9 100644
--- a/go/door_client_zmq/zeromq.go
+++ b/go/door_client_zmq/zeromq.go
@@ -10,58 +10,59 @@ import (
 // ---------- ZeroMQ Code -------------
 
 func ZmqsInit(cmd_port, sub_port string)  (ctx *zmq.Context, cmd_chans, sub_chans *zmq.Channels) {
-    var subfilter []byte
     var err error
     ctx, err = zmq.NewContext()
     if err != nil {
         panic(err)
     }
-    //close only on panic, otherwise leave open:
+    //close only on later panic, otherwise leave open:
     defer func(){ if r:= recover(); r != nil { ctx.Close(); panic(r) } }()
 
-    cmd_sock, err := ctx.Socket(zmq.Req)
-    if err != nil {
-        panic(err)
-    }
-    defer func() { if r:= recover(); r != nil { cmd_sock.Close(); panic(r) } }()
+    if len(cmd_port) > 0 {
+        cmd_sock, err := ctx.Socket(zmq.Req)
+        if err != nil {
+            panic(err)
+        }
+        defer func() { if r:= recover(); r != nil { cmd_sock.Close(); panic(r) } }()
 
-    cmd_sock.SetRecvTimeout(2 * time.Second)
-    cmd_sock.SetSendTimeout(2 * time.Second)
+        cmd_sock.SetRecvTimeout(2 * time.Second)
+        cmd_sock.SetSendTimeout(2 * time.Second)
 
-    sub_sock, err := ctx.Socket(zmq.Sub)
-    if err != nil {
-        panic(err)
-    }
-    defer func() { if r:= recover(); r != nil { sub_sock.Close(); panic(r) } }()
+        if err = cmd_sock.Connect(cmd_port); err != nil {
+            panic(err)
+        }
 
-    if err = cmd_sock.Connect(cmd_port); err != nil {
-        panic(err)
+        cmd_chans = cmd_sock.ChannelsBuffer(10)
+        go zmqsHandleError(cmd_chans)
+    } else {
+        cmd_chans = nil
     }
 
-    sub_sock.Subscribe(subfilter)
+    if len(sub_port) > 0 {
+        sub_sock, err := ctx.Socket(zmq.Sub)
+        if err != nil {
+            panic(err)
+        }
+        defer func() { if r:= recover(); r != nil { sub_sock.Close(); panic(r) } }()
 
-    if err = sub_sock.Connect(sub_port); err != nil {
-        panic(err)
-    }
+        sub_sock.Subscribe([]byte{}) //subscribe empty filter -> aka to all messages
+
+        if err = sub_sock.Connect(sub_port); err != nil {
+            panic(err)
+        }
 
-    cmd_chans = cmd_sock.ChannelsBuffer(10)
-    sub_chans = cmd_sock.ChannelsBuffer(10)
+        sub_chans = sub_sock.ChannelsBuffer(10)
+        go zmqsHandleError(sub_chans)
+    } else {
+        sub_chans = nil
+    }
 
-    go zmqsHandleError(cmd_chans, sub_chans)
     return
 }
 
-func zmqsHandleError(cmd_chans, sub_chans *zmq.Channels) {
-    for {
-        select {
-            case cmd_error := <- cmd_chans.Errors():
-                cmd_chans.Close()
-                sub_chans.Close()
-                panic(cmd_error)
-            case sub_error := <- sub_chans.Errors():
-                cmd_chans.Close()
-                sub_chans.Close()
-                panic(sub_error)
-        }
+func zmqsHandleError(chans *zmq.Channels) {
+    for error := range(chans.Errors()) {
+        chans.Close()
+        panic(error)
     }
-}
\ No newline at end of file
+}