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

Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.

Browse source 
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
This commit is contained in:
drigato 2014-11-05 16:24:03 -05:00
parent 27b8f0ac13
commit e24b4f43fd
6 changed files with 30 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/application/configs/conf.php
View file

@ -25,13 +25,16 @@ class Config {
$filename = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf";
}
// Parse separate conf file for Amazon S3 values
$amazonFilename = "/etc/airtime-saas/amazon.conf";
$amazonValues = parse_ini_file($amazonFilename, true);
$CC_CONFIG['cloud_storage'] = $amazonValues['cloud_storage'];
$values = parse_ini_file($filename, true);
// Name of the web server user
$CC_CONFIG['webServerUser'] = $values['general']['web_server_user'];
$CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
$CC_CONFIG['cloud_storage'] = $values['cloud_storage'];
$CC_CONFIG['baseDir'] = $values['general']['base_dir'];
$CC_CONFIG['baseUrl'] = $values['general']['base_url'];