ZeroMQ plugin: Publishers should connect, subscribers should bind.

Change-Id: I783df8a3604fd903500588c5a9495d49f62240c8

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 6d37a1f..848128d 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -4816,13 +4816,12 @@ are:
 
 Publish values to a list of subscribers. Each value is send to all subscribers,
 unless their high water mark has been reached. The B<Endpoint> options of this
-socket should list I<local> addresses that the publisher should I<bind> to.
+socket should list I<remote> addresses that the publisher should I<connect> to.
 
 =item Subscribe
 
 Subscribe to values published by a publisher. The B<Endpoint> options of this
-socket should list I<remote> addresses that the subscriber should I<connect>
-to.
+socket should list I<local> addresses that the subscriber should I<bind> to.
 
 =item Push
 

diff --git a/src/zeromq.c b/src/zeromq.c
index ea6399f..ab642a6 100644 (file)
--- a/src/zeromq.c
+++ b/src/zeromq.c
@@ -338,7 +338,7 @@ static int cmq_config_socket (oconfig_item_t *ci) /* {{{ */
       if (status != 0)
         continue;
 
-      if ((type == ZMQ_PUB) || (type == ZMQ_PULL))
+      if ((type == ZMQ_SUB) || (type == ZMQ_PULL))
       {
         DEBUG("Binding to %s", value);
         status = zmq_bind (cmq_socket, value);
@@ -350,7 +350,7 @@ static int cmq_config_socket (oconfig_item_t *ci) /* {{{ */
           continue;
         }
       }
-      else if ((type == ZMQ_SUB) || (type == ZMQ_PUSH))
+      else if ((type == ZMQ_PUB) || (type == ZMQ_PUSH))
       {
         DEBUG("Connecting to %s", value);
         status = zmq_connect (cmq_socket, value);