From 43483dc112ce2a6097651add068002e1640dd097 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Tue, 22 Apr 2014 12:28:20 -0400 Subject: [PATCH] Added dev env to RabbitMQ stuff for Analyzer (fixed) --- airtime_mvc/application/configs/conf.php | 1 + airtime_mvc/application/models/RabbitMq.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php index 903b845c2..129c90104 100644 --- a/airtime_mvc/application/configs/conf.php +++ b/airtime_mvc/application/configs/conf.php @@ -35,6 +35,7 @@ class Config { $CC_CONFIG['baseUrl'] = $values['general']['base_url']; $CC_CONFIG['basePort'] = $values['general']['base_port']; $CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; + $CC_CONFIG['dev_env'] = $values['general']['dev_env']; $CC_CONFIG['cache_ahead_hours'] = $values['general']['cache_ahead_hours']; diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php index 51341e9be..208d9d4ab 100644 --- a/airtime_mvc/application/models/RabbitMq.php +++ b/airtime_mvc/application/models/RabbitMq.php @@ -84,10 +84,10 @@ class Application_Model_RabbitMq { //Hack for Airtime Pro. The RabbitMQ settings for communicating with airtime_analyzer are global //and shared between all instances on Airtime Pro. - $CC_CONFIG = Config::getConfig(); + $CC_CONFIG = Config::getConfig(); $devEnv = "production"; //Default - if (array_key_exists("dev_env", $CC_CONFIG["general"])) { - $devEnv = $CC_CONFIG["general"]["dev_env"]; + if (array_key_exists("dev_env", $CC_CONFIG)) { + $devEnv = $CC_CONFIG["dev_env"]; } $config = parse_ini_file("/etc/airtime-saas/rabbitmq-analyzer-" . $devEnv . ".ini", true); $conn = new AMQPConnection($config["rabbitmq"]["host"],