Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Rudi Grinberg 2012-09-05 16:09:39 -04:00
parent 8a5333fa7f dc9a181f7e
commit 7ad4d8cdd6
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
airtime_mvc/application/models/Show.php
View File

@ -1833,7 +1833,8 @@ SELECT si.starts AS start_timestamp,
starts,
ends
FROM cc_show_instances si,
cc_show s
LEFT JOIN cc_show s
ON si.instance_id = s.id
WHERE si.show_id = s.id
AND si.starts <= :timeNow1::timestamp
AND si.ends > :timeNow2::timestamp
@ -1875,7 +1876,8 @@ SELECT si.starts AS start_timestamp,
starts,
ends
FROM cc_show_instances si,
cc_show s
LEFT JOIN cc_show s
ON si.instance_id = s.id
WHERE si.show_id = s.id
AND si.starts > :timeNow1::timestamp - INTERVAL '2 days'
AND si.ends < :timeNow2::timestamp + INTERVAL '2 days'
@ -2012,9 +2014,10 @@ SELECT si.starts AS start_timestamp,
s.url,
starts,
ends
FROM cc_show_instances,
cc_show
WHERE si.show_id = s.id"
FROM cc_show_instances si
LEFT JOIN cc_show s
ON si.instance_id = s.id
WHERE si.show_id = s.id
AND si.starts >= :timeStart::timestamp
AND si.starts < :timeEnd::timestamp
AND modified_instance != TRUE

3
utils/rabbitmq-update-pid.sh
View File

@ -5,8 +5,7 @@ pid_found="$?"
if [ "$pid_found" == "0" ]; then
#PID is available in the status message
rabbitmqstatus=`/etc/init.d/rabbitmq-server status | grep "\[{pid"`
rabbitmqpid=`echo $rabbitmqstatus | sed "s/.*,\(.*\)\}.*/\1/"`
rabbitmqpid=`/etc/init.d/rabbitmq-server status | grep "\[{pid" | sed "s/.*,\(.*\)\}.*/\1/"`
else
#PID should be available from file
rabbitmqpid=`sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids`