From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 10 Aug 2010 07:20:54 +0000 (+0200)
Subject: amqp plugin: Warn about incorrectly used "ExchangeType" option in "Publish" block... 
X-Git-Tag: collectd-5.0.0-beta0~28^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c93443fba5ae325325db311850ff0d6d9f7135e3;p=collectd.git

amqp plugin: Warn about incorrectly used "ExchangeType" option in "Publish" block, too.
---

diff --git a/src/amqp.c b/src/amqp.c
index d6cd2756..c77c345b 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -862,15 +862,16 @@ static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */
             break;
     } /* for (i = 0; i < ci->children_num; i++) */
 
-    if ((status == 0) && !publish && (conf->exchange == NULL))
+    if ((status == 0) && (conf->exchange == NULL))
     {
-        if (conf->routing_key != NULL)
-            WARNING ("amqp plugin: The option \"RoutingKey\" was given "
-                    "without the \"Exchange\" option. It will be ignored.");
-
         if (conf->exchange_type != NULL)
             WARNING ("amqp plugin: The option \"ExchangeType\" was given "
                     "without the \"Exchange\" option. It will be ignored.");
+
+        if (!publish && (conf->routing_key != NULL))
+            WARNING ("amqp plugin: The option \"RoutingKey\" was given "
+                    "without the \"Exchange\" option. It will be ignored.");
+
     }
 
     if (status != 0)