From efbd2f53d0000a2fbd6776f5aeb95bb27d99be7d Mon Sep 17 00:00:00 2001 From: James Date: Tue, 11 Oct 2011 14:40:30 -0400 Subject: [PATCH 1/2] CC-2745: Show status of liquidsoap/icecast connection on Stream Settings page - temp commit --- airtime_mvc/application/models/StreamSetting.php | 9 ++++++--- python_apps/api_clients/api_client.py | 4 +++- python_apps/pypo/liquidsoap_scripts/ls_lib.liq | 3 +-- python_apps/pypo/liquidsoap_scripts/notify.sh | 2 +- python_apps/pypo/pypo-notify.py | 8 ++++---- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php index 1febaf042..77efc6f6e 100644 --- a/airtime_mvc/application/models/StreamSetting.php +++ b/airtime_mvc/application/models/StreamSetting.php @@ -83,15 +83,18 @@ class Application_Model_StreamSetting { $sql = "SELECT COUNT(*) FROM cc_stream_setting" ." WHERE keyname = '$keyname'"; $result = $CC_DBC->GetOne($sql); - + Logging::log("setError"); if ($result == 1){ $sql = "UPDATE cc_stream_setting" - ." SET value = '$value'" + ." SET value = '$msg'" ." WHERE keyname = '$keyname'"; }else{ $sql = "INSERT INTO cc_stream_setting (keyname, value, type)" - ." VALUES ($keyname, '$msg', 'string')"; + ." VALUES ('$keyname', '$msg', 'string')"; } + Logging::log($sql); + $res = $CC_DBC->query($sql); + Logging::log($res); } public static function getLiquidsoapError($stream_id){ diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py index 5fb9aa7b4..7c944b468 100755 --- a/python_apps/api_clients/api_client.py +++ b/python_apps/api_clients/api_client.py @@ -577,7 +577,9 @@ class AirTimeApiClient(ApiClientInterface): url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["update_liquidsoap_error"]) url = url.replace("%%api_key%%", self.config["api_key"]) - url = url.replace("%%error_msg%%", error_msg) + error_msg = error_msg.replace('/', ' ') + encoded_msg = urllib.quote(error_msg, '') + url = url.replace("%%error_msg%%", encoded_msg) url = url.replace("%%stream_id%%", stream_id) logger.debug(url) req = urllib2.Request(url) diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq index 910573c37..47c035700 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq @@ -39,8 +39,7 @@ end def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, description, genre, user, s, stream) = def on_error(msg) - system("airtime-check-system > ~/temp/temp1.log 2>&1") - system("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --error='#{msg}' --stream-id=#{stream} > ~/temp/temp.log 2>&1") + system("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --error='#{msg}' --stream-id=#{stream}") log("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --error='#{msg}' --stream-id=#{stream}") 5. end diff --git a/python_apps/pypo/liquidsoap_scripts/notify.sh b/python_apps/pypo/liquidsoap_scripts/notify.sh index 51563c124..848428cee 100755 --- a/python_apps/pypo/liquidsoap_scripts/notify.sh +++ b/python_apps/pypo/liquidsoap_scripts/notify.sh @@ -10,4 +10,4 @@ SCRIPT=`readlink -f $0` # Absolute path this script is in SCRIPTPATH=`dirname $SCRIPT` -cd ${SCRIPTPATH}/../ && python pypo-notify.py $1 $2 $3 $4 $5 $6 $7 $8 & +cd ${SCRIPTPATH}/../ && python pypo-notify.py "$@" diff --git a/python_apps/pypo/pypo-notify.py b/python_apps/pypo/pypo-notify.py index e1416a8d8..5b1842f1c 100644 --- a/python_apps/pypo/pypo-notify.py +++ b/python_apps/pypo/pypo-notify.py @@ -47,7 +47,7 @@ parser = OptionParser(usage=usage) # Options parser.add_option("-d", "--data", help="Pass JSON data from liquidsoap into this script.", metavar="data") parser.add_option("-m", "--media-id", help="ID of the file that is currently playing.", metavar="media_id") -parser.add_option("-e", "--error", help="liquidsoap error msg.", metavar="error_msg") +parser.add_option("-e", "--error", action="store", dest="error", type="string", help="liquidsoap error msg.", metavar="error_msg") parser.add_option("-s", "--stream-id", help="ID stream", metavar="stream_id") parser.add_option("-c", "--connect", help="liquidsoap connected", action="store_true", metavar="connect") @@ -109,13 +109,13 @@ if __name__ == '__main__': # initialize logger = logging.getLogger() - if options.error_msg and options.stream_id: + if options.error and options.stream_id: try: n = Notify() - n.notify_liquidsoap_error(options.error_msg, options.stream_id) + n.notify_liquidsoap_error(options.error, options.stream_id) except Exception, e: print e - elif optioins.connect and options.stream_id: + elif options.connect and options.stream_id: try: n = Notify() n.notify_liquidsoap_connection(options.stream_id) From 20e900231032c4418549cea3ece4c8e461e8a445 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 11 Oct 2011 16:36:01 -0400 Subject: [PATCH 2/2] CC-2956: Undefined variable: endDateTime in /usr/share/airtime/application/models/Show.php on line 807, referer: http://localhost/Schedule - fixed --- airtime_mvc/application/models/RabbitMq.php | 2 +- airtime_mvc/application/models/Show.php | 2 +- airtime_mvc/application/models/StreamSetting.php | 3 --- .../js/airtime/schedule/full-calendar-functions.js | 13 ++++++++++++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php index 83e188ba4..bc5eaa1f7 100644 --- a/airtime_mvc/application/models/RabbitMq.php +++ b/airtime_mvc/application/models/RabbitMq.php @@ -75,7 +75,7 @@ class Application_Model_RabbitMq $channel->exchange_declare($EXCHANGE, 'direct', false, true); $now = new DateTime("@".time()); - $end_timestamp = new DateTime("@".time() + 3600*2); + $end_timestamp = new DateTime("@".(time() + 3600*2)); $temp['event_type'] = $event_type; $temp['server_timezone'] = Application_Model_Preference::GetTimezone(); diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 0c7afa4a5..3c004b2d1 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -804,7 +804,7 @@ class Application_Model_Show { $utcStartDateTime->add(new DateInterval("P".$daysAdd."D")); } - if (is_null($endDateTime) || $utcStartDateTime->getTimestamp() <= $endDateTime->getTimestamp()) { + if (is_null($endDate) || $utcStartDateTime->getTimestamp() <= $endDateTime->getTimestamp()) { $showDay = new CcShowDays(); $showDay->setDbFirstShow($utcStartDateTime->format("Y-m-d")); $showDay->setDbLastShow($endDate); diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php index 77efc6f6e..7d5c20cdd 100644 --- a/airtime_mvc/application/models/StreamSetting.php +++ b/airtime_mvc/application/models/StreamSetting.php @@ -83,7 +83,6 @@ class Application_Model_StreamSetting { $sql = "SELECT COUNT(*) FROM cc_stream_setting" ." WHERE keyname = '$keyname'"; $result = $CC_DBC->GetOne($sql); - Logging::log("setError"); if ($result == 1){ $sql = "UPDATE cc_stream_setting" ." SET value = '$msg'" @@ -92,9 +91,7 @@ class Application_Model_StreamSetting { $sql = "INSERT INTO cc_stream_setting (keyname, value, type)" ." VALUES ('$keyname', '$msg', 'string')"; } - Logging::log($sql); $res = $CC_DBC->query($sql); - Logging::log($res); } public static function getLiquidsoapError($stream_id){ diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index aad7c7b18..c77f435bc 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -48,6 +48,17 @@ function removeAddShowButton(){ span.remove(); } +function pad(number, length) { + + var str = '' + number; + while (str.length < length) { + str = '0' + str; + } + + return str; + +} + function makeTimeStamp(date){ var sy, sm, sd, h, m, s, timestamp; sy = date.getFullYear(); @@ -57,7 +68,7 @@ function makeTimeStamp(date){ m = date.getMinutes(); s = date.getSeconds(); - timestamp = sy+"-"+ sm +"-"+ sd +" "+ h +":"+ m +":"+ s; + timestamp = sy+"-"+ pad(sm, 2) +"-"+ pad(sd, 2) +" "+ pad(h, 2) +":"+ pad(m, 2) +":"+ pad(s, 2); return timestamp; }