-fixed on-air light not working.

This commit is contained in:
Martin Konecny 2011-10-11 13:36:07 +02:00
parent 1b1e389cf6
commit 8fe10830d5
6 changed files with 18 additions and 7 deletions

View File

@ -61,6 +61,8 @@ python ${SCRIPTPATH}/../python_apps/icecast2/install/icecast2-install.py
# reload its config files.
/etc/init.d/monit restart
#allow monit to boot up before issuing commands
sleep 1
set +e
monit monitor airtime-media-monitor

View File

@ -6,7 +6,7 @@ virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
ls_user="pypo"
export HOME="/var/tmp/airtime/pypo/"
api_client_path="/usr/lib/airtime/"
ls_path="/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap"
ls_path="/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap --verbose"
ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"
exec 2>&1

View File

@ -107,11 +107,21 @@ case "${1:-''}" in
# status commands here
/usr/bin/airtime-check-system
;;
'stop-liquidsoap')
echo -n "Stopping Liquidsoap: "
liquidsoap_stop
echo "Done."
;;
'start-liquidsoap')
echo -n "Starting Liquidsoap: "
liquidsoap_start
echo "Done."
;;
'restart-liquidsoap')
# restart commands here
echo -n "Restarting Liquidsoap: "
liquidsoap_stop
liquidsoap_start
stop-liquidsoap
start-liquidsoap
echo "Done."
;;
*) # no parameter specified

View File

@ -109,7 +109,7 @@ try:
os.remove(config["bin_dir"]+"/bin/liquidsoap_scripts/liquidsoap.cfg")
print "Setting permissions"
#os.system("chmod -R 755 "+config["bin_dir"])
os.system("chmod 755 "+os.path.join(config["bin_dir"], "liquidsoap_scripts/notify.sh"))
os.system("chown -R pypo:pypo "+config["bin_dir"])
os.system("chown -R pypo:pypo "+config["cache_base_dir"])

View File

@ -1,6 +1,6 @@
def notify(m)
log("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
system("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
print("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
end
# A function applied to each metadata chunk
@ -45,7 +45,6 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
end
output = output.icecast(host = host,
port = port,
encoding = "UTF-8",
password = pass,
mount = mount_point,
fallible = true,

View File

@ -10,4 +10,4 @@ SCRIPT=`readlink -f $0`
# Absolute path this script is in
SCRIPTPATH=`dirname $SCRIPT`
cd ${SCRIPTPATH}/../ && ./pypo-notify.py $1 $2 $3 $4 $5 $6 $7 $8 &
cd ${SCRIPTPATH}/../ && python pypo-notify.py $1 $2 $3 $4 $5 $6 $7 $8 &