From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 22 Mar 2010 18:56:13 +0000 (+0100)
Subject: amqp plugin: Explain numeric arguments to "amqp_login" and "amqp_basic_publish".
X-Git-Tag: collectd-5.0.0-beta0~28^2~35
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=76cc183820029c42951e7a0988270e6dfba874a0;p=collectd.git

amqp plugin: Explain numeric arguments to "amqp_login" and "amqp_basic_publish".
---

diff --git a/src/amqp.c b/src/amqp.c
index 512c3349..23526e2e 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -116,7 +116,11 @@ static int amqp_write(const data_set_t *ds, const value_list_t *vl, user_data_t
         return (1);
     }
     amqp_set_sockfd(conn, sockfd);
-    reply = amqp_login(conn, vhost, 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, user, password);
+    reply = amqp_login(conn, vhost,
+            /* channel max = */      0,
+            /* frame max = */   131072,
+            /* heartbeat = */        0,
+            /* authentication: */ AMQP_SASL_METHOD_PLAIN, user, password);
     if (reply.reply_type != AMQP_RESPONSE_NORMAL)
     {
         amqp_destroy_connection(conn);
@@ -140,13 +144,13 @@ static int amqp_write(const data_set_t *ds, const value_list_t *vl, user_data_t
     format_json_finalize(buffer, &bfill, &bfree);
     props._flags = AMQP_BASIC_CONTENT_TYPE_FLAG | AMQP_BASIC_DELIVERY_MODE_FLAG;
     props.content_type = amqp_cstring_bytes("application/json");
-    props.delivery_mode = 2; // persistent delivery mode
+    props.delivery_mode = 2; /* persistent delivery mode */
     error = amqp_basic_publish(conn,
-                1,
+                /* channel = */ 1,
                 amqp_cstring_bytes(exchange),
                 amqp_cstring_bytes(routingkey),
-                0,
-                0,
+                /* mandatory = */ 0,
+                /* immediate = */ 0,
                 &props,
                 amqp_cstring_bytes(buffer));
     reply = amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS);
@@ -179,3 +183,4 @@ void module_register(void)
     plugin_register_shutdown(PLUGIN_NAME, shutdown);
 }
 
+/* vim: set sw=4 sts=4 et : */