diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php index c3e7edccf..f5e7fb0c3 100644 --- a/airtime_mvc/application/models/RabbitMq.php +++ b/airtime_mvc/application/models/RabbitMq.php @@ -130,48 +130,45 @@ class Application_Model_RabbitMq } - /** - * Disabled to prevent warnings about /etc/airtime-saas/rabbitmq.ini - */ -// public static function SendMessageToHaproxyConfigDaemon($md){ -// $config = parse_ini_file("/etc/airtime-saas/rabbitmq.ini", true); -// $conn = new AMQPConnection($config["rabbitmq"]["host"], -// $config["rabbitmq"]["port"], -// $config["rabbitmq"]["user"], -// $config["rabbitmq"]["password"], -// $config["rabbitmq"]["vhost"]); + public static function SendMessageToHaproxyConfigDaemon($md){ + $config = parse_ini_file("/etc/airtime-saas/rabbitmq.ini", true); + $conn = new AMQPConnection($config["rabbitmq"]["host"], + $config["rabbitmq"]["port"], + $config["rabbitmq"]["user"], + $config["rabbitmq"]["password"], + $config["rabbitmq"]["vhost"]); -// $exchange = $config["rabbitmq"]["queue"]; -// $queue = $config["rabbitmq"]["queue"]; + $exchange = $config["rabbitmq"]["queue"]; + $queue = $config["rabbitmq"]["queue"]; -// $ch = $conn->channel(); + $ch = $conn->channel(); -// /* -// name: $queue -// passive: false -// durable: true // the queue will survive server restarts -// exclusive: false // the queue can be accessed in other channels -// auto_delete: false //the queue won't be deleted once the channel is closed. -// */ -// $ch->queue_declare($queue, false, true, false, false); + /* + name: $queue + passive: false + durable: true // the queue will survive server restarts + exclusive: false // the queue can be accessed in other channels + auto_delete: false //the queue won't be deleted once the channel is closed. + */ + $ch->queue_declare($queue, false, true, false, false); -// /* -// name: $exchange -// type: direct -// passive: false -// durable: true // the exchange will survive server restarts -// auto_delete: false //the exchange won't be deleted once the channel is closed. -// */ + /* + name: $exchange + type: direct + passive: false + durable: true // the exchange will survive server restarts + auto_delete: false //the exchange won't be deleted once the channel is closed. + */ -// $ch->exchange_declare($exchange, 'direct', false, true, false); -// $ch->queue_bind($queue, $exchange); + $ch->exchange_declare($exchange, 'direct', false, true, false); + $ch->queue_bind($queue, $exchange); -// $data = json_encode($md).PHP_EOL; -// $msg = new AMQPMessage($data, array('content_type' => 'application/json')); + $data = json_encode($md).PHP_EOL; + $msg = new AMQPMessage($data, array('content_type' => 'application/json')); -// $ch->basic_publish($msg, $exchange); -// $ch->close(); -// $conn->close(); -// } + $ch->basic_publish($msg, $exchange); + $ch->close(); + $conn->close(); + } } diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 61ebb8888..ecee18275 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -879,6 +879,7 @@ SELECT si1.starts AS starts, show.name AS name, show.color AS color, show.background_color AS background_color, + show.image_path AS image_path, show.linked AS linked, si1.file_id AS file_id, si1.id AS instance_id, @@ -1080,6 +1081,7 @@ SELECT si.starts AS start_timestamp, si.id AS instance_id, si.record, s.url, + s.image_path, starts, ends FROM cc_show_instances si @@ -1121,8 +1123,8 @@ SQL; $CC_CONFIG = Config::getConfig(); $con = Propel::getConnection(); - // - //TODO, returning starts + ends twice (once with an alias). Unify this after the 2.0 release. --Martin + + //TODO, returning starts + ends twice (once with an alias). Unify this after the 2.0 release. --Martin $sql = << $rows[$i-1]['starts'], "ends" => $rows[$i-1]['ends'], "record" => $rows[$i-1]['record'], + "image_path" => $rows[$i-1]['image_path'], "type" => "show"); } @@ -1197,7 +1201,8 @@ SQL; "starts" => $rows[$i+1]['starts'], "ends" => $rows[$i+1]['ends'], "record" => $rows[$i+1]['record'], - "type" => "show"); + "image_path" => $rows[$i+1]['image_path'], + "type" => "show"); } break; } @@ -1217,7 +1222,8 @@ SQL; "starts" => $rows[$i]['starts'], "ends" => $rows[$i]['ends'], "record" => $rows[$i]['record'], - "type" => "show"); + "image_path" => $rows[$i]['image_path'], + "type" => "show"); break; } } @@ -1233,7 +1239,8 @@ SQL; "starts" => $rows[$previousShowIndex]['starts'], "ends" => $rows[$previousShowIndex]['ends'], "record" => $rows[$previousShowIndex]['record'], - "type" => "show"); + "image_path" => $rows[$previousShowIndex]['image_path'], + "type" => "show"); } return $results; @@ -1268,7 +1275,8 @@ SELECT si.starts AS start_timestamp, si.id AS instance_id, si.record, s.url, - starts, + s.image_path, + starts, ends FROM cc_show_instances si LEFT JOIN cc_show s