From d81afca7e342a15660690dfae46ebbb22bbd55ee Mon Sep 17 00:00:00 2001 From: drigato Date: Tue, 17 Jun 2014 14:17:28 -0400 Subject: [PATCH] Adding detailed log statements for actions involving show scheduling --- .../controllers/ScheduleController.php | 72 ++++++++++++++++++- .../controllers/ShowbuilderController.php | 24 +++++++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index 95415f8be..f3d61d867 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -167,6 +167,15 @@ class ScheduleController extends Zend_Controller_Action $deltaDay = $this->_getParam('day'); $deltaMin = $this->_getParam('min'); + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "schedule/move-show"; + $log_vars["params"] = array(); + $log_vars["params"]["instance id"] = $this->_getParam('showInstanceId'); + $log_vars["params"]["delta day"] = $deltaDay; + $log_vars["params"]["delta minute"] = $deltaMin; + Logging::info($log_vars); + try { $service_calendar = new Application_Service_CalendarService( $this->_getParam('showInstanceId')); @@ -174,7 +183,7 @@ class ScheduleController extends Zend_Controller_Action $this->view->show_error = true; return false; } - + $error = $service_calendar->moveShow($deltaDay, $deltaMin); if (isset($error)) { $this->view->error = $error; @@ -188,6 +197,15 @@ class ScheduleController extends Zend_Controller_Action $showId = $this->_getParam('showId'); $instanceId = $this->_getParam('instanceId'); + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "schedule/resize-show"; + $log_vars["params"] = array(); + $log_vars["params"]["instance id"] = $instanceId; + $log_vars["params"]["delta day"] = $deltaDay; + $log_vars["params"]["delta minute"] = $deltaMin; + Logging::info($log_vars); + $userInfo = Zend_Auth::getInstance()->getStorage()->read(); $user = new Application_Model_User($userInfo->id); @@ -211,6 +229,13 @@ class ScheduleController extends Zend_Controller_Action { $instanceId = $this->_getParam('id'); + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "schedule/delete-show-instance"; + $log_vars["params"] = array(); + $log_vars["params"]["instance id"] = $instanceId; + Logging::info($log_vars); + $service_show = new Application_Service_ShowService(); $showId = $service_show->deleteShow($instanceId, true); @@ -223,6 +248,7 @@ class ScheduleController extends Zend_Controller_Action public function uploadToSoundCloudAction() { $show_instance = $this->_getParam('id'); + try { $show_inst = new Application_Model_ShowInstance($show_instance); } catch (Exception $e) { @@ -250,6 +276,13 @@ class ScheduleController extends Zend_Controller_Action public function clearShowAction() { $instanceId = $this->_getParam('id'); + + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "schedule/clear-show"; + $log_vars["params"] = array(); + $log_vars["params"]["instance id"] = $instanceId; + Logging::info($log_vars); $service_scheduler = new Application_Service_SchedulerService(); @@ -425,6 +458,13 @@ class ScheduleController extends Zend_Controller_Action $data['add_show_hosts'] = $this->_getParam('hosts'); + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "schedule/edit-repeating-show-instance"; + $log_vars["params"] = array(); + $log_vars["params"]["form_data"] = $data; + Logging::info($log_vars); + $service_showForm = new Application_Service_ShowFormService( $data["add_show_id"], $data["add_show_instance_id"]); $service_show = new Application_Service_ShowService(null, $data); @@ -476,6 +516,13 @@ class ScheduleController extends Zend_Controller_Action if ($data['add_show_day_check'] == "") { $data['add_show_day_check'] = null; } + + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "schedule/edit-show"; + $log_vars["params"] = array(); + $log_vars["params"]["form_data"] = $data; + Logging::info($log_vars); $forms = $this->createShowFormAction(); @@ -525,6 +572,13 @@ class ScheduleController extends Zend_Controller_Action if ($data['add_show_day_check'] == "") { $data['add_show_day_check'] = null; } + + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "schedule/add-show"; + $log_vars["params"] = array(); + $log_vars["params"]["form_data"] = $data; + Logging::info($log_vars); $forms = $this->createShowFormAction(); @@ -572,10 +626,17 @@ class ScheduleController extends Zend_Controller_Action public function deleteShowAction() { $instanceId = $this->_getParam('id'); + + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "schedule/delete-show"; + $log_vars["params"] = array(); + $log_vars["params"]["instance id"] = $instanceId; + Logging::info($log_vars); $service_show = new Application_Service_ShowService(); $showId = $service_show->deleteShow($instanceId); - + if (!$showId) { $this->view->show_error = true; } @@ -584,6 +645,13 @@ class ScheduleController extends Zend_Controller_Action public function cancelCurrentShowAction() { + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "schedule/cancel-current-show"; + $log_vars["params"] = array(); + $log_vars["params"]["instance id"] = $this->_getParam('id'); + Logging::info($log_vars); + $user = Application_Model_User::getCurrentUser(); if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 2ccd29ce4..48f766018 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -324,8 +324,17 @@ class ShowbuilderController extends Zend_Controller_Action public function scheduleAddAction() { $request = $this->getRequest(); + $mediaItems = $request->getParam("mediaIds", array()); $scheduledItems = $request->getParam("schedIds", array()); + + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "showbuilder/schedule-add"; + $log_vars["params"] = array(); + $log_vars["params"]["media_items"] = $mediaItems; + $log_vars["params"]["scheduled_items"] = $scheduledItems; + Logging::info($log_vars); try { $scheduler = new Application_Model_Scheduler(); @@ -343,6 +352,13 @@ class ShowbuilderController extends Zend_Controller_Action { $request = $this->getRequest(); $items = $request->getParam("items", array()); + + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "showbuilder/schedule-remove"; + $log_vars["params"] = array(); + $log_vars["params"]["removed_items"] = $items; + Logging::info($log_vars); try { $scheduler = new Application_Model_Scheduler(); @@ -361,6 +377,14 @@ class ShowbuilderController extends Zend_Controller_Action $request = $this->getRequest(); $selectedItems = $request->getParam("selectedItem"); $afterItem = $request->getParam("afterItem"); + + $log_vars = array(); + $log_vars["url"] = $_SERVER['HTTP_HOST']; + $log_vars["action"] = "showbuilder/schedule-move"; + $log_vars["params"] = array(); + $log_vars["params"]["selected_items"] = $selectedItems; + $log_vars["params"]["destination_after_item"] = $afterItem; + Logging::info($log_vars); try { $scheduler = new Application_Model_Scheduler();