From c93443fba5ae325325db311850ff0d6d9f7135e3 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Tue, 10 Aug 2010 09:20:54 +0200 Subject: [PATCH] amqp plugin: Warn about incorrectly used "ExchangeType" option in "Publish" block, too. --- src/amqp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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) -- 2.11.0