diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py index 10e3891f4..f211f0e20 100644 --- a/python_apps/pypo/pypofetch.py +++ b/python_apps/pypo/pypofetch.py @@ -16,6 +16,7 @@ from datetime import datetime from datetime import timedelta from Queue import Empty import filecmp +import thread # For RabbitMQ from kombu.connection import BrokerConnection @@ -83,7 +84,7 @@ class PypoFetch(Thread): if command == 'update_schedule': self.schedule_data = m['schedule'] - self.process_schedule(self.schedule_data, "scheduler", False) + thread.start_new_thread(self.process_schedule, (self.schedule_data, "scheduler", False)) elif command == 'update_stream_setting': logger.info("Updating stream setting...") self.regenerateLiquidsoapConf(m['setting']) @@ -99,7 +100,7 @@ class PypoFetch(Thread): elif command == 'update_recorder_schedule': temp = m if temp is not None: - self.parse_shows(temp) + self.process_recorder_schedule(temp) elif command == 'cancel_recording': self.recorder_queue.put('cancel_recording') except Exception, e: @@ -331,7 +332,7 @@ class PypoFetch(Thread): return datetime(date[0], date[1], date[2], time[0], time[1], time[2], 0, None) - def parse_shows(self, m): + def process_recorder_schedule(self, m): logger = logging.getLogger('fetch') logger.info("Parsing recording show schedules...") shows_to_record = {} @@ -518,14 +519,14 @@ class PypoFetch(Thread): status, self.schedule_data = self.api_client.get_schedule() if status == 1: logger.info("Bootstrap schedule received: %s", self.schedule_data) - self.process_schedule(self.schedule_data, "scheduler", True) + thread.start_new_thread(self.process_schedule, (self.schedule_data, "scheduler", True)) # Bootstrap: since we are just starting up, we need to grab the # most recent schedule. After that we can just wait for updates. try: temp = self.api_client.get_shows_to_record() if temp is not None: - self.parse_shows(temp) + self.process_recorder_schedule(temp) logger.info("Bootstrap recorder schedule received: %s", temp) except Exception, e: logger.error(e) @@ -583,14 +584,14 @@ class PypoFetch(Thread): """ status, self.schedule_data = self.api_client.get_schedule() if status == 1: - self.process_schedule(self.schedule_data, "scheduler", False) + thread.start_new_thread(self.process_schedule, (self.schedule_data, "scheduler", False)) """ Fetch recorder schedule """ try: temp = self.api_client.get_shows_to_record() if temp is not None: - self.parse_shows(temp) + self.process_recorder_schedule(temp) logger.info("updated recorder schedule received: %s", temp) except Exception, e: logger.error(e)