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

CC-3794: Liquidsoap isn't in media monitor's path

Browse source
This commit is contained in:
Martin Konecny 2012-05-09 14:18:17 -04:00
parent 3b2e812e51
commit aeb9db95f0
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
python_apps/media-monitor/airtime-media-monitor
View file

@ -15,7 +15,6 @@ cd ${media_monitor_path}
exec 2>&1
export PYTHONPATH=${api_client_path}
export PATH=/usr/lib/airtime/pypo/bin/liquidsoap_bin/:$PATH
# Note the -u when calling python! we need it to get unbuffered binary stdout and stderr
exec python -u ${media_monitor_path}${media_monitor_script} > /var/log/airtime/media-monitor/py-interpreter.log 2>&1

2
python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
View file

@ -325,7 +325,7 @@ class MediaMonitorCommon:
#with '\''. This breaks the string into two, and inserts an escaped single quote in between them.
#We run the command as pypo because otherwise the target file is opened with write permissions, and this causes an inotify ON_CLOSE_WRITE event
#to be fired :/
command = "sudo -u pypo liquidsoap -c 'output.dummy(audio_to_stereo(single(\"%s\")))' > /dev/null 2>&1" % pathname.replace("'", "'\\''")
command = "sudo -u pypo airtime-liquidsoap -c 'output.dummy(audio_to_stereo(single(\"%s\")))' > /dev/null 2>&1" % pathname.replace("'", "'\\''")
return_code = subprocess.call(command, shell=True)
if return_code != 0:
#print pathname for py-interpreter.log