From eb0f12c7096e67dfd850de28affb026821645760 Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 10 Nov 2014 12:25:40 -0500 Subject: [PATCH 1/4] Change back rabbitmq config file param name --- python_apps/airtime_analyzer/bin/airtime_analyzer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/airtime_analyzer/bin/airtime_analyzer b/python_apps/airtime_analyzer/bin/airtime_analyzer index ff17fc2f2..92e387965 100755 --- a/python_apps/airtime_analyzer/bin/airtime_analyzer +++ b/python_apps/airtime_analyzer/bin/airtime_analyzer @@ -17,7 +17,7 @@ def run(): parser = argparse.ArgumentParser() parser.add_argument("-d", "--daemon", help="run as a daemon", action="store_true") parser.add_argument("--debug", help="log full debugging output", action="store_true") - parser.add_argument("--config-file", help="specify a configuration file with RabbitMQ settings (default is %s)" % DEFAULT_CONFIG_PATH) + parser.add_argument("--rmq-config-file", help="specify a configuration file with RabbitMQ settings (default is %s)" % DEFAULT_CONFIG_PATH) parser.add_argument("--http-retry-queue-file", help="specify where incompleted HTTP requests will be serialized (default is %s)" % DEFAULT_HTTP_RETRY_PATH) args = parser.parse_args() From 49f3881da064277baf50d6c2384b640c6f2da573 Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 10 Nov 2014 12:35:41 -0500 Subject: [PATCH 2/4] rmq_config_path fix --- python_apps/airtime_analyzer/bin/airtime_analyzer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python_apps/airtime_analyzer/bin/airtime_analyzer b/python_apps/airtime_analyzer/bin/airtime_analyzer index 92e387965..35debbd41 100755 --- a/python_apps/airtime_analyzer/bin/airtime_analyzer +++ b/python_apps/airtime_analyzer/bin/airtime_analyzer @@ -26,8 +26,8 @@ def run(): #Default config file path config_path = DEFAULT_CONFIG_PATH http_retry_queue_path = DEFAULT_HTTP_RETRY_PATH - if args.config_file: - config_path = args.config_file + if args.rmq_config_file: + config_path = args.rmq_config_file if args.http_retry_queue_file: http_retry_queue_path = args.http_retry_queue_file From b304e2fa34cb008032020298c10465ca282ed5b9 Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 10 Nov 2014 12:53:07 -0500 Subject: [PATCH 3/4] Bug fix --- airtime_mvc/application/models/airtime/CcFiles.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/airtime/CcFiles.php b/airtime_mvc/application/models/airtime/CcFiles.php index 956e8181e..01eed8d55 100644 --- a/airtime_mvc/application/models/airtime/CcFiles.php +++ b/airtime_mvc/application/models/airtime/CcFiles.php @@ -103,7 +103,7 @@ class CcFiles extends BaseCcFiles { throw new Exception("Invalid music_dir for file in database."); } $directory = $music_dir->getDirectory(); - $filepath = $this->_file->getDbFilepath(); + $filepath = $this->getDbFilepath(); return Application_Common_OsPath::join($directory, $filepath); } From dbc55632e18630e7cec91c5185f8bb82191fc7cb Mon Sep 17 00:00:00 2001 From: drigato Date: Tue, 11 Nov 2014 13:58:55 -0500 Subject: [PATCH 4/4] Changed print statements so they go to the pypo log --- python_apps/pypo/cloud_storage_downloader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python_apps/pypo/cloud_storage_downloader.py b/python_apps/pypo/cloud_storage_downloader.py index 4565985e9..f5768df29 100644 --- a/python_apps/pypo/cloud_storage_downloader.py +++ b/python_apps/pypo/cloud_storage_downloader.py @@ -75,10 +75,10 @@ class CloudStorageDownloader: try: config.readfp(open(config_path)) except IOError as e: - print "Failed to open config file at " + config_path + ": " + e.strerror + logging.debug("Failed to open config file at %s: %s" % (config_path, e.strerror)) sys.exit() except Exception: - print e.strerror + logging.debug(e.strerror) sys.exit() return config