summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Limberg <grant.limberg@zerotier.com>2019-03-08 10:21:19 -0800
committerGrant Limberg <grant.limberg@zerotier.com>2019-03-08 10:21:19 -0800
commite5155df6d549ef396c1160699f0460226812f091 (patch)
tree2dd2d0b06bd3583881625a773e6f27d930b1a842
parent293d2064c40ea1f9c7bb374cd1298d8dbd45a5c7 (diff)
parent171cc3e01add8d25d221f4a29d6961b8a1a9d32e (diff)
downloadinfinitytier-e5155df6d549ef396c1160699f0460226812f091.tar.gz
infinitytier-e5155df6d549ef396c1160699f0460226812f091.zip
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
-rw-r--r--controller/RabbitMQ.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/controller/RabbitMQ.cpp b/controller/RabbitMQ.cpp
index e6b8c819..096d3f53 100644
--- a/controller/RabbitMQ.cpp
+++ b/controller/RabbitMQ.cpp
@@ -48,13 +48,13 @@ void RabbitMQ::init()
}
static int chan = 0;
- amqp_channel_open(_conn, ++chan);
+ _channel = ++chan;
+ amqp_channel_open(_conn, _channel);
r = amqp_get_rpc_reply(_conn);
if(r.reply_type != AMQP_RESPONSE_NORMAL) {
throw std::runtime_error("Error opening communication channel");
}
- _channel = chan;
-
+
_q = amqp_queue_declare(_conn, _channel, amqp_cstring_bytes(_qName), 0, 0, 0, 0, amqp_empty_table);
r = amqp_get_rpc_reply(_conn);
if (r.reply_type != AMQP_RESPONSE_NORMAL) {