MQ plugin for Kafka: change the config param name for zookeeper connection

timeouts to the name used by Apache Kafka

trackrdrd/src/mq/kafka/README.rst

@@ -154,10 +154,10 @@ Parameter                           Description
                                     ``metadata.broker.list`` MUST be set, as
                                     described above.
 ----------------------------------- --------------------------------------------
-``zookeeper.timeout``               Timeout in milliseconds for connections to
-                                    ZooKeeper servers. If 0, then a connection
-                                    attempt fails immediately if the servers
-                                    cannot be reached. (optional, default 0)
+``zookeeper.connection.timeout.ms`` Timeout for connections to ZooKeeper
+                                    servers. If 0, then a connection  attempt
+                                    fails immediately if the servers cannot be
+                                    reached. (optional, default 0)
 ----------------------------------- --------------------------------------------
 ``zookeeper.log``                   Path of a log file for the ZooKeeper client
                                     (optional)

trackrdrd/src/mq/kafka/config.c

@@ -89,8 +89,7 @@ CONF_Add(const char *lval, const char *rval)
         strncpy(zookeeper, rval, LINE_MAX);
         return(0);
     }
-    /* XXX: "zookeeper.connection.timeout.ms", to match Kafka config */
-    if (strcmp(lval, "zookeeper.timeout") == 0) {
+    if (strcmp(lval, "zookeeper.connection.timeout.ms") == 0) {
         if ((err = conf_getUnsignedInt(rval, &zoo_timeout)) != 0)
             return(err);
         return(0);

trackrdrd/src/mq/kafka/test/kafka.conf

 # test config for Kafka MQ plugin
 mq.log = kafka.log
 zookeeper.connect = localhost:2181
-zookeeper.timeout = 10000
+zookeeper.connection.timeout.ms = 10000
 zookeeper.log = zoo.log
 topic = libtrackrdr_kafka_test
 mq.debug = true