From 4608f0414046d33a0c1d23fede908180a2bdec7f Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 23 May 2012 00:43:05 -0400 Subject: [PATCH 1/4] remove useless logging --- airtime_mvc/application/models/Schedule.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index a1df73747..931eeab2b 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -45,8 +45,6 @@ class Application_Model_Schedule { $nextShowID = count($shows['nextShow'])>0?$shows['nextShow'][0]['instance_id']:null; $results = Application_Model_Schedule::GetPrevCurrentNext($previousShowID, $currentShowID, $nextShowID, $utcTimeNow); - Logging::log($shows['currentShow']); - $range = array("env"=>APPLICATION_ENV, "schedulerTime"=>$timeNow, "previous"=>$results['previous'] !=null?$results['previous']:(count($shows['previousShow'])>0?$shows['previousShow'][0]:null), From 7299704ed0defe0edfa9e735e49098fe8f6c9bbd Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 23 May 2012 12:38:37 -0400 Subject: [PATCH 2/4] remove airtime-liquidsoap symbolic link on uninstall --- python_apps/pypo/install/pypo-uninitialize.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python_apps/pypo/install/pypo-uninitialize.py b/python_apps/pypo/install/pypo-uninitialize.py index 19d27768d..16b6ceab9 100644 --- a/python_apps/pypo/install/pypo-uninitialize.py +++ b/python_apps/pypo/install/pypo-uninitialize.py @@ -9,6 +9,7 @@ if os.geteuid() != 0: try: #stop pypo and liquidsoap processes print "Waiting for pypo processes to stop...", + subprocess.call("rm -f /usr/bin/airtime-liquidsoap") if (os.path.exists('/etc/init.d/airtime-playout')): subprocess.call("invoke-rc.d airtime-playout stop", shell=True) print "OK" From a9695999860f0a012f764d6b2720228a12cb6b98 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 23 May 2012 14:55:55 -0400 Subject: [PATCH 3/4] CC-3858: Record and Rebroadcast Creation Problem\ - fixed --- airtime_mvc/application/models/Show.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index cb91a454e..2392cc81a 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -848,7 +848,7 @@ class Application_Model_Show { $showId = $this->getId(); $sql = "SELECT id FROM cc_show_instances" ." WHERE date(starts) = date(TIMESTAMP '$timestamp') " - ." AND show_id = $showId"; + ." AND show_id = $showId AND rebroadcast = 0"; $query = $con->query($sql); $row = ($query !== false) ? $query->fetchColumn(0) : null; From 01439663d981aae427dfa36e1ffba422202b77f2 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 23 May 2012 15:06:22 -0400 Subject: [PATCH 4/4] CC-3863: Stats should not send version number with extra characters - fixed --- airtime_mvc/application/models/Preference.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 2505a563f..369315f58 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -412,7 +412,13 @@ class Application_Model_Preference $key == 'FREE_RAM' || $key == 'AIRTIME_VERSION' || $key == 'KERNAL_VERSION' || $key == 'MACHINE_ARCHITECTURE' || $key == 'TOTAL_MEMORY_MBYTES' || $key == 'TOTAL_SWAP_MBYTES' || $key == 'PLAYOUT_ENGINE_CPU_PERC' ) { - $systemInfoArray[$key] = $info[1]; + if($key == 'AIRTIME_VERSION'){ + // remove hash tag on the version string + list($version, $dump) = explode('+', $info[1]); + $systemInfoArray[$key] = $version; + }else{ + $systemInfoArray[$key] = $info[1]; + } } } }