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

refactor(playout): improve exceptions handling (#2027)

Browse source
This commit is contained in:
Jonas L 2022-08-09 21:05:21 +02:00 • committed by GitHub
parent 1b93b7645e
commit 9413bd5a29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 123 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

19
playout/libretime_playout/player/liquidsoap.py
View file

@ -64,9 +64,9 @@ class PypoLiquidsoap:
try:
self.telnet_liquidsoap.queue_push(available_queue, media_item)
self.liq_queue_tracker[available_queue] = media_item
except Exception as e:
logger.error(e)
raise
except Exception as exception:
logger.exception(exception)
raise exception
else:
logger.warning(
"File %s did not become ready in less than 5 seconds. Skipping...",
@ -87,13 +87,12 @@ class PypoLiquidsoap:
def find_available_queue(self):
available_queue = None
for i in self.liq_queue_tracker:
mi = self.liq_queue_tracker[i]
if mi == None or self.is_media_item_finished(mi):
for queue_id, item in self.liq_queue_tracker.items():
if item is None or self.is_media_item_finished(item):
# queue "i" is available. Push to this queue
available_queue = i
available_queue = queue_id
if available_queue == None:
if available_queue is None:
raise NoQueueAvailableException()
return available_queue
@ -192,8 +191,8 @@ class PypoLiquidsoap:
# something is playing and it shouldn't be.
self.telnet_liquidsoap.stop_web_stream_buffer()
self.telnet_liquidsoap.stop_web_stream_output()
except KeyError as e:
logger.error("Error: Malformed event in schedule. " + str(e))
except KeyError as exception:
logger.exception(f"Malformed event in schedule: {exception}")
def stop(self, queue):
self.telnet_liquidsoap.queue_remove(queue)