diff --git a/install_minimal/upgrades/airtime-2.0.0/media-monitor.cfg.200 b/install_minimal/upgrades/airtime-2.0.0/media-monitor.cfg.200 index 066c42b31..44819833b 100644 --- a/install_minimal/upgrades/airtime-2.0.0/media-monitor.cfg.200 +++ b/install_minimal/upgrades/airtime-2.0.0/media-monitor.cfg.200 @@ -13,6 +13,7 @@ log_dir = '/var/log/airtime/media-monitor' rabbitmq_host = 'localhost' rabbitmq_user = 'guest' rabbitmq_password = 'guest' +rabbitmq_vhost = '/' ############################################ # Media-Monitor preferences # diff --git a/install_minimal/upgrades/airtime-2.0.0/pypo.cfg.200 b/install_minimal/upgrades/airtime-2.0.0/pypo.cfg.200 index 352d234d0..3280ba540 100644 --- a/install_minimal/upgrades/airtime-2.0.0/pypo.cfg.200 +++ b/install_minimal/upgrades/airtime-2.0.0/pypo.cfg.200 @@ -39,6 +39,7 @@ ls_port = '1234' rabbitmq_host = 'localhost' rabbitmq_user = 'guest' rabbitmq_password = 'guest' +rabbitmq_vhost = '/' ############################################ # pypo preferences # diff --git a/install_minimal/upgrades/airtime-2.0.0/recorder.cfg.200 b/install_minimal/upgrades/airtime-2.0.0/recorder.cfg.200 index 762c01da3..d6005bf0a 100644 --- a/install_minimal/upgrades/airtime-2.0.0/recorder.cfg.200 +++ b/install_minimal/upgrades/airtime-2.0.0/recorder.cfg.200 @@ -15,6 +15,7 @@ log_dir = '/var/log/airtime/show-recorder' rabbitmq_host = 'localhost' rabbitmq_user = 'guest' rabbitmq_password = 'guest' +rabbitmq_vhost = '/' ############################################ # Recorded Audio settings # diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py index 1f75f0bba..b93ff3c24 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py @@ -39,7 +39,7 @@ class AirtimeNotifier(Notifier): try: schedule_exchange = Exchange("airtime-media-monitor", "direct", durable=True, auto_delete=True) 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() consumer = Consumer(channel, schedule_queue) consumer.register_callback(self.handle_message) diff --git a/python_apps/media-monitor/media-monitor.cfg b/python_apps/media-monitor/media-monitor.cfg index 066c42b31..44819833b 100644 --- a/python_apps/media-monitor/media-monitor.cfg +++ b/python_apps/media-monitor/media-monitor.cfg @@ -13,6 +13,7 @@ log_dir = '/var/log/airtime/media-monitor' rabbitmq_host = 'localhost' rabbitmq_user = 'guest' rabbitmq_password = 'guest' +rabbitmq_vhost = '/' ############################################ # Media-Monitor preferences # diff --git a/python_apps/pypo/pypo.cfg b/python_apps/pypo/pypo.cfg index 352d234d0..3280ba540 100644 --- a/python_apps/pypo/pypo.cfg +++ b/python_apps/pypo/pypo.cfg @@ -39,6 +39,7 @@ ls_port = '1234' rabbitmq_host = 'localhost' rabbitmq_user = 'guest' rabbitmq_password = 'guest' +rabbitmq_vhost = '/' ############################################ # pypo preferences # diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py index c0dffd9eb..a34ac756e 100644 --- a/python_apps/pypo/pypofetch.py +++ b/python_apps/pypo/pypofetch.py @@ -57,7 +57,7 @@ class PypoFetch(Thread): try: schedule_exchange = Exchange("airtime-pypo", "direct", durable=True, auto_delete=True) 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() consumer = Consumer(channel, schedule_queue) consumer.register_callback(self.handle_message) diff --git a/python_apps/show-recorder/recorder.cfg b/python_apps/show-recorder/recorder.cfg index 762c01da3..d6005bf0a 100644 --- a/python_apps/show-recorder/recorder.cfg +++ b/python_apps/show-recorder/recorder.cfg @@ -15,6 +15,7 @@ log_dir = '/var/log/airtime/show-recorder' rabbitmq_host = 'localhost' rabbitmq_user = 'guest' rabbitmq_password = 'guest' +rabbitmq_vhost = '/' ############################################ # Recorded Audio settings # diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py index e01e496f9..7cf7e0ab9 100644 --- a/python_apps/show-recorder/recorder.py +++ b/python_apps/show-recorder/recorder.py @@ -183,7 +183,7 @@ class CommandListener(): try: schedule_exchange = Exchange("airtime-show-recorder", "direct", durable=True, auto_delete=True) 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() consumer = Consumer(channel, schedule_queue) consumer.register_callback(self.handle_message)