From 6de8bbe9679749cbe68894e699775cd5a38587b5 Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 15 Dec 2014 12:27:51 -0500 Subject: [PATCH 1/2] SAAS-514: PYPO -> Tracks may not become ready in time for playout --- python_apps/pypo/pypoliquidsoap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python_apps/pypo/pypoliquidsoap.py b/python_apps/pypo/pypoliquidsoap.py index 74211fddd..62779200f 100644 --- a/python_apps/pypo/pypoliquidsoap.py +++ b/python_apps/pypo/pypoliquidsoap.py @@ -48,11 +48,11 @@ class PypoLiquidsoap(): def handle_file_type(self, media_item): """ - Wait maximum 5 seconds (50 iterations) for file to become ready, + Wait 200 seconds (2000 iterations) for file to become ready, otherwise give up on it. """ iter_num = 0 - while not media_item['file_ready'] and iter_num < 50: + while not media_item['file_ready'] and iter_num < 2000: time.sleep(0.1) iter_num += 1 From 2af14e099b592a6959e9eae8619be649deb646c4 Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 15 Dec 2014 12:49:13 -0500 Subject: [PATCH 2/2] SAAS-519: webstreams not being deleted --- airtime_mvc/application/controllers/WebstreamController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index 8eb9a2ac5..1d94923c3 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -88,7 +88,7 @@ class WebstreamController extends Zend_Controller_Action public function isAuthorized($webstream_id) { $user = Application_Model_User::getCurrentUser(); - if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { + if ($user->isUserType(array(UTYPE_SUPERADMIN, UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { return true; }