Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-3371: Don't pause 2 seconds between checking queue in pypo-push 

-Done
This commit is contained in:
Martin Konecny 2012-03-18 00:33:22 -04:00
parent 22cc362f1c
commit d35332e0ba
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
python_apps/pypo/pypopush.py
View File

@ -10,6 +10,8 @@ import calendar
import json import json
import math import math
from Queue import Empty
from threading import Thread from threading import Thread
from api_clients import api_client from api_clients import api_client
@ -41,7 +43,7 @@ class PypoPush(Thread):
self.telnet_lock = telnet_lock self.telnet_lock = telnet_lock
self.push_ahead = 10 self.push_ahead = 5
self.last_end_time = 0 self.last_end_time = 0
self.pushed_objects = {} self.pushed_objects = {}
@ -57,17 +59,17 @@ class PypoPush(Thread):
""" """
liquidsoap_queue_approx = self.get_queue_items_from_liquidsoap() liquidsoap_queue_approx = self.get_queue_items_from_liquidsoap()
# get a new schedule from pypo-fetch try:
if not self.queue.empty(): self.media = self.queue.get(block=True, timeout=PUSH_INTERVAL)
# make sure we get the latest schedule if not self.queue.empty():
while not self.queue.empty(): while not self.queue.empty():
self.media = self.queue.get() self.media = self.queue.get()
self.logger.debug("Received data from pypo-fetch") self.logger.debug("Received data from pypo-fetch")
self.logger.debug('media %s' % json.dumps(self.media)) self.logger.debug('media %s' % json.dumps(self.media))
self.handle_new_media(self.media, liquidsoap_queue_approx) self.handle_new_media(self.media, liquidsoap_queue_approx)
except Empty, e:
pass
media = self.media media = self.media
@ -371,5 +373,4 @@ class PypoPush(Thread):
try: self.push() try: self.push()
except Exception, e: except Exception, e:
self.logger.error('Pypo Push Exception: %s', e) self.logger.error('Pypo Push Exception: %s', e)
time.sleep(PUSH_INTERVAL)
loops += 1 loops += 1