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

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

This commit is contained in:
Naomi 2011-04-15 13:38:56 -04:00
parent dfa508a9ea 0320c9a136
commit b80c0ed65a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/models/Schedule.php
View File

@ -190,7 +190,8 @@ class ScheduleGroup {
." LEFT JOIN $CC_CONFIG[showInstances] as si" ." LEFT JOIN $CC_CONFIG[showInstances] as si"
." ON st.instance_id = si.id" ." ON st.instance_id = si.id"
." WHERE st.group_id=$this->groupId" ." WHERE st.group_id=$this->groupId"
." AND st.starts < si.ends"; ." AND st.starts < si.ends"
." ORDER BY st.starts";
return $CC_DBC->GetAll($sql); return $CC_DBC->GetAll($sql);
} }

2
dev_tools/pl.sh
View File

@ -2,4 +2,4 @@
echo echo
echo "This will tail the pypo-liquidsoap log file." echo "This will tail the pypo-liquidsoap log file."
echo "Type in password for pypo user (default password is 'pypo'):" echo "Type in password for pypo user (default password is 'pypo'):"
su -l pypo -c "tail -F /etc/service/pypo-liquidsoap/log/main/current" su -l pypo -c "tail -F /var/log/airtime/pypo-liquidsoap/main/current"

2
dev_tools/pr.sh
View File

@ -4,4 +4,4 @@ echo
echo "This will tail the recorder log file." echo "This will tail the recorder log file."
echo "Type in password for pypo user (default password is 'pypo'):" echo "Type in password for pypo user (default password is 'pypo'):"
su -l pypo -c "tail -F /etc/service/recorder/log/main/current" su -l pypo -c "tail -F /var/log/airtime/recorder/main/current"