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

Merge branch 'master' of dev.sourcefabric.org:airtime

Browse source
This commit is contained in:
martin 2011-03-23 22:15:28 -04:00
commit 5d0e224139
3 changed files with 30 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/models/Preference.php
View file

@ -63,6 +63,7 @@ class Application_Model_Preference
Application_Model_Preference::SetValue("station_name", $title); Application_Model_Preference::SetValue("station_name", $title);
$defaultNamespace = new Zend_Session_Namespace('title_name'); $defaultNamespace = new Zend_Session_Namespace('title_name');
$defaultNamespace->title = $title; $defaultNamespace->title = $title;
RabbitMq::PushSchedule();
//set session variable to new station name so that html title is updated. //set session variable to new station name so that html title is updated.
//should probably do this in a view helper to keep this controller as minimal as possible. //should probably do this in a view helper to keep this controller as minimal as possible.
@ -88,6 +89,7 @@ class Application_Model_Preference
public static function SetStreamLabelFormat($type){ public static function SetStreamLabelFormat($type){
Application_Model_Preference::SetValue("stream_label_format", $type); Application_Model_Preference::SetValue("stream_label_format", $type);
RabbitMq::PushSchedule();
} }
public static function GetStreamLabelFormat(){ public static function GetStreamLabelFormat(){

10
pypo/config.cfg
View file

@ -41,13 +41,11 @@ cache_for = 24 #how long to hold the cache, in hours
# Poll interval in seconds. # Poll interval in seconds.
# #
# This is how often the poll script downloads new schedules and files from the # This will rarely need to be changed because any schedule changes are
# server. # automatically sent to pypo immediately.
# #
# For production use, this number depends on whether you plan on making any # This is how often the poll script downloads new schedules and files from the
# last-minute changes to your schedule. This number should be set to half of # server in the event that no changes are made to the schedule.
# the time you expect to "lock-in" your schedule. So if your schedule is set
# 24 hours in advance, this can be set to poll every 12 hours.
# #
poll_interval = 3600 # in seconds. poll_interval = 3600 # in seconds.

13
python_apps/show-recorder/install/recorder-stop.py
View file

@ -9,17 +9,8 @@ if os.geteuid() != 0:
sys.exit(1) sys.exit(1)
try: try:
print "Stopping daemontool script pypo" print "Stopping daemontool script recorder"
os.system("svc -dx /etc/service/pypo 1>/dev/null 2>&1") os.system("svc -dx /etc/service/recorder 1>/dev/null 2>&1")
if os.path.exists("/etc/service/pypo-fetch"):
os.system("svc -dx /etc/service/pypo-fetch 1>/dev/null 2>&1")
if os.path.exists("/etc/service/pypo-push"):
os.system("svc -dx /etc/service/pypo-push 1>/dev/null 2>&1")
print "Stopping daemontool script pypo-liquidsoap"
os.system("svc -dx /etc/service/pypo-liquidsoap 1>/dev/null 2>&1")
os.system("killall liquidsoap")
except Exception, e: except Exception, e:
print "exception:" + str(e) print "exception:" + str(e)