From ee6a4f808cf45ffc4d66e5d0eac3231c23207031 Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Fri, 27 Sep 2013 11:04:08 +1000 Subject: [PATCH] Fix up log reporting --- turbo_hipster/lib/utils.py | 2 +- .../task_plugins/gate_real_db_upgrade/handle_results.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/turbo_hipster/lib/utils.py b/turbo_hipster/lib/utils.py index eda0c0a..016c69c 100644 --- a/turbo_hipster/lib/utils.py +++ b/turbo_hipster/lib/utils.py @@ -190,7 +190,7 @@ def push_file(job_log_dir, file_path, publish_config): """ Push a log file to a server. Returns the public URL """ method = publish_config['type'] + '_push_file' if method in globals() and hasattr(globals()[method], '__call__'): - return globals()[method](dest_dir, file_path, publish_config) + return globals()[method](job_log_dir, file_path, publish_config) def swift_push_file(job_log_dir, file_path, swift_config): diff --git a/turbo_hipster/task_plugins/gate_real_db_upgrade/handle_results.py b/turbo_hipster/task_plugins/gate_real_db_upgrade/handle_results.py index 791ac18..dc0df02 100644 --- a/turbo_hipster/task_plugins/gate_real_db_upgrade/handle_results.py +++ b/turbo_hipster/task_plugins/gate_real_db_upgrade/handle_results.py @@ -56,7 +56,8 @@ def generate_push_results(datasets, publish_config): """ Generates and pushes results """ for i, dataset in enumerate(datasets): - result_uri = push_file(dataset['job_log_file_path'], + result_uri = push_file(dataset['determined_path'], + dataset['job_log_file_path'], publish_config) datasets[i]['result_uri'] = result_uri