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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source 
Conflicts:
	install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor/airtimemetadata.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
	utils/airtime-import/airtime-import.py
This commit is contained in:
James 2011-08-08 10:44:06 -04:00
commit c0e07dbd9e
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
utils/airtime-check-system.php
View file

@ -111,7 +111,7 @@ class AirtimeCheck {
"LIQUIDSOAP_PROCESS_ID", "LIQUIDSOAP_PROCESS_ID",
"LIQUIDSOAP_RUNNING_SECONDS", "LIQUIDSOAP_RUNNING_SECONDS",
"Liquidsoap", "Liquidsoap",
"/var/log/airtime/pypo/ls_script.log" "/var/log/airtime/pypo-liquidsoap/ls_script.log"
); );
self::CheckAirtimeDaemonRunning("/var/run/airtime-media-monitor.pid", self::CheckAirtimeDaemonRunning("/var/run/airtime-media-monitor.pid",