SAAS-56: RabbitMQ virtual host support
-Add support for specifying vhost in config files
This commit is contained in:
parent
2f1033ecb8
commit
21643a3734
9 changed files with 9 additions and 3 deletions
|
@ -13,6 +13,7 @@ log_dir = '/var/log/airtime/media-monitor'
|
||||||
rabbitmq_host = 'localhost'
|
rabbitmq_host = 'localhost'
|
||||||
rabbitmq_user = 'guest'
|
rabbitmq_user = 'guest'
|
||||||
rabbitmq_password = 'guest'
|
rabbitmq_password = 'guest'
|
||||||
|
rabbitmq_vhost = '/'
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# Media-Monitor preferences #
|
# Media-Monitor preferences #
|
||||||
|
|
|
@ -39,6 +39,7 @@ ls_port = '1234'
|
||||||
rabbitmq_host = 'localhost'
|
rabbitmq_host = 'localhost'
|
||||||
rabbitmq_user = 'guest'
|
rabbitmq_user = 'guest'
|
||||||
rabbitmq_password = 'guest'
|
rabbitmq_password = 'guest'
|
||||||
|
rabbitmq_vhost = '/'
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# pypo preferences #
|
# pypo preferences #
|
||||||
|
|
|
@ -15,6 +15,7 @@ log_dir = '/var/log/airtime/show-recorder'
|
||||||
rabbitmq_host = 'localhost'
|
rabbitmq_host = 'localhost'
|
||||||
rabbitmq_user = 'guest'
|
rabbitmq_user = 'guest'
|
||||||
rabbitmq_password = 'guest'
|
rabbitmq_password = 'guest'
|
||||||
|
rabbitmq_vhost = '/'
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# Recorded Audio settings #
|
# Recorded Audio settings #
|
||||||
|
|
|
@ -39,7 +39,7 @@ class AirtimeNotifier(Notifier):
|
||||||
try:
|
try:
|
||||||
schedule_exchange = Exchange("airtime-media-monitor", "direct", durable=True, auto_delete=True)
|
schedule_exchange = Exchange("airtime-media-monitor", "direct", durable=True, auto_delete=True)
|
||||||
schedule_queue = Queue("media-monitor", exchange=schedule_exchange, key="filesystem")
|
schedule_queue = Queue("media-monitor", exchange=schedule_exchange, key="filesystem")
|
||||||
self.connection = BrokerConnection(self.config.cfg["rabbitmq_host"], self.config.cfg["rabbitmq_user"], self.config.cfg["rabbitmq_password"], "/")
|
self.connection = BrokerConnection(self.config.cfg["rabbitmq_host"], self.config.cfg["rabbitmq_user"], self.config.cfg["rabbitmq_password"], self.config.cfg["rabbitmq_vhost"])
|
||||||
channel = self.connection.channel()
|
channel = self.connection.channel()
|
||||||
consumer = Consumer(channel, schedule_queue)
|
consumer = Consumer(channel, schedule_queue)
|
||||||
consumer.register_callback(self.handle_message)
|
consumer.register_callback(self.handle_message)
|
||||||
|
|
|
@ -13,6 +13,7 @@ log_dir = '/var/log/airtime/media-monitor'
|
||||||
rabbitmq_host = 'localhost'
|
rabbitmq_host = 'localhost'
|
||||||
rabbitmq_user = 'guest'
|
rabbitmq_user = 'guest'
|
||||||
rabbitmq_password = 'guest'
|
rabbitmq_password = 'guest'
|
||||||
|
rabbitmq_vhost = '/'
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# Media-Monitor preferences #
|
# Media-Monitor preferences #
|
||||||
|
|
|
@ -39,6 +39,7 @@ ls_port = '1234'
|
||||||
rabbitmq_host = 'localhost'
|
rabbitmq_host = 'localhost'
|
||||||
rabbitmq_user = 'guest'
|
rabbitmq_user = 'guest'
|
||||||
rabbitmq_password = 'guest'
|
rabbitmq_password = 'guest'
|
||||||
|
rabbitmq_vhost = '/'
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# pypo preferences #
|
# pypo preferences #
|
||||||
|
|
|
@ -57,7 +57,7 @@ class PypoFetch(Thread):
|
||||||
try:
|
try:
|
||||||
schedule_exchange = Exchange("airtime-pypo", "direct", durable=True, auto_delete=True)
|
schedule_exchange = Exchange("airtime-pypo", "direct", durable=True, auto_delete=True)
|
||||||
schedule_queue = Queue("pypo-fetch", exchange=schedule_exchange, key="foo")
|
schedule_queue = Queue("pypo-fetch", exchange=schedule_exchange, key="foo")
|
||||||
self.connection = BrokerConnection(config["rabbitmq_host"], config["rabbitmq_user"], config["rabbitmq_password"], "/")
|
self.connection = BrokerConnection(config["rabbitmq_host"], config["rabbitmq_user"], config["rabbitmq_password"], config["rabbitmq_vhost"])
|
||||||
channel = self.connection.channel()
|
channel = self.connection.channel()
|
||||||
consumer = Consumer(channel, schedule_queue)
|
consumer = Consumer(channel, schedule_queue)
|
||||||
consumer.register_callback(self.handle_message)
|
consumer.register_callback(self.handle_message)
|
||||||
|
|
|
@ -15,6 +15,7 @@ log_dir = '/var/log/airtime/show-recorder'
|
||||||
rabbitmq_host = 'localhost'
|
rabbitmq_host = 'localhost'
|
||||||
rabbitmq_user = 'guest'
|
rabbitmq_user = 'guest'
|
||||||
rabbitmq_password = 'guest'
|
rabbitmq_password = 'guest'
|
||||||
|
rabbitmq_vhost = '/'
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# Recorded Audio settings #
|
# Recorded Audio settings #
|
||||||
|
|
|
@ -183,7 +183,7 @@ class CommandListener():
|
||||||
try:
|
try:
|
||||||
schedule_exchange = Exchange("airtime-show-recorder", "direct", durable=True, auto_delete=True)
|
schedule_exchange = Exchange("airtime-show-recorder", "direct", durable=True, auto_delete=True)
|
||||||
schedule_queue = Queue("recorder-fetch", exchange=schedule_exchange, key="foo")
|
schedule_queue = Queue("recorder-fetch", exchange=schedule_exchange, key="foo")
|
||||||
self.connection = BrokerConnection(config["rabbitmq_host"], config["rabbitmq_user"], config["rabbitmq_password"], "/")
|
self.connection = BrokerConnection(config["rabbitmq_host"], config["rabbitmq_user"], config["rabbitmq_password"], config["rabbitmq_vhost"])
|
||||||
channel = self.connection.channel()
|
channel = self.connection.channel()
|
||||||
consumer = Consumer(channel, schedule_queue)
|
consumer = Consumer(channel, schedule_queue)
|
||||||
consumer.register_callback(self.handle_message)
|
consumer.register_callback(self.handle_message)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue