From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 4 Aug 2010 17:00:50 +0000 (+0200)
Subject: amqp plugin: Add error messages and give saner example config values.
X-Git-Tag: collectd-5.0.0-beta0~28^2~28
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc016773bc8aac7604bdf11bc44077067836104e;p=collectd.git

amqp plugin: Add error messages and give saner example config values.
---

diff --git a/src/amqp.c b/src/amqp.c
index 55066351..48993648 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -113,9 +113,11 @@ static int amqp_write(const data_set_t *ds, const value_list_t *vl, user_data_t
     amqp_connection_state_t conn;
     amqp_basic_properties_t props;
 
+    /* TODO: Don't create a new connection for each value that is to be dispatched. */
     conn = amqp_new_connection();
     if ((sockfd = amqp_open_socket(host, port)) < 0)
     {
+        ERROR ("amqp plugin: amqp_open_socket failed.");
         amqp_destroy_connection(conn);
         return (1);
     }
@@ -127,6 +129,8 @@ static int amqp_write(const data_set_t *ds, const value_list_t *vl, user_data_t
             /* authentication: */ AMQP_SASL_METHOD_PLAIN, user, password);
     if (reply.reply_type != AMQP_RESPONSE_NORMAL)
     {
+        ERROR ("amqp plugin: amqp_login (vhost = %s, user = %s) failed.",
+                vhost, user);
         amqp_destroy_connection(conn);
         close(sockfd);
         return (1);
@@ -134,6 +138,7 @@ static int amqp_write(const data_set_t *ds, const value_list_t *vl, user_data_t
     amqp_channel_open(conn, 1);
     if (reply.reply_type != AMQP_RESPONSE_NORMAL)
     {
+        ERROR ("amqp plugin: amqp_channel_open failed.");
         amqp_connection_close(conn, AMQP_REPLY_SUCCESS);
         amqp_destroy_connection(conn);
         close(sockfd);
@@ -159,6 +164,12 @@ static int amqp_write(const data_set_t *ds, const value_list_t *vl, user_data_t
                 /* immediate = */ 0,
                 &props,
                 amqp_cstring_bytes(buffer));
+    if (error != 0)
+    {
+        ERROR ("amqp plugin: amqp_basic_publish failed with status %i.",
+                error);
+    }
+
     reply = amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS);
     if (reply.reply_type != AMQP_RESPONSE_NORMAL)
         error = 1;
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 03d80ae8..85f79d67 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -150,12 +150,12 @@
 ##############################################################################
 
 #<Plugin "amqp">
-#	Host "host"
+#	Host "localhost"
 #	Port "5672"
-#	VHost "vhost"
+#	VHost "/"
 #	User "collectd"
 #	Password "aiwaeZ0y"
-#	Exchange "exchange"
+#	Exchange "amq.direct"
 #	RoutingKey "routing_key"
 #</Plugin>