summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-06-22 20:46:56 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2016-06-30 11:15:24 +0800
commitfa07c352a88830c985991b361068778239cb9cab (patch)
treeb9542a570d5a6142250180be75f175f1beaa3a47
parentb7182381972ff8df6124adc271d9eb9e7a610b27 (diff)
add log info when publish json to elasticsearch failed
add logger.info when publish failed JIRA: FUNCTEST-325 Change-Id: I353001c4305af31dd725e0977ced53d52ba79470 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
-rw-r--r--utils/test/scripts/mongo_to_elasticsearch.py7
-rw-r--r--utils/test/scripts/shared_utils.py4
2 files changed, 9 insertions, 2 deletions
diff --git a/utils/test/scripts/mongo_to_elasticsearch.py b/utils/test/scripts/mongo_to_elasticsearch.py
index a569ac61c..2ffbc1713 100644
--- a/utils/test/scripts/mongo_to_elasticsearch.py
+++ b/utils/test/scripts/mongo_to_elasticsearch.py
@@ -395,7 +395,12 @@ def publish_mongo_data(output_destination):
for mongo_json_line in fobj:
test_result = json.loads(mongo_json_line)
if modify_mongo_entry(test_result):
- shared_utils.publish_json(test_result, es_creds, output_destination)
+ status, data = shared_utils.publish_json(test_result, es_creds, output_destination)
+ if status > 300:
+ project = test_result['project_name']
+ case_name = test_result['case_name']
+ logger.info('project {} case {} publish failed, due to [{}]'
+ .format(project, case_name, json.loads(data)['error']['reason']))
finally:
if os.path.exists(tmp_filename):
os.remove(tmp_filename)
diff --git a/utils/test/scripts/shared_utils.py b/utils/test/scripts/shared_utils.py
index 91ce38e45..8bbbdbe07 100644
--- a/utils/test/scripts/shared_utils.py
+++ b/utils/test/scripts/shared_utils.py
@@ -12,9 +12,11 @@ def publish_json(json_ojb, creds, output_destination):
json_dump = json.dumps(json_ojb)
if output_destination == 'stdout':
print json_dump
+ return 200, None
else:
headers = urllib3.make_headers(basic_auth=creds)
- http.request('POST', output_destination, headers=headers, body=json_dump)
+ result = http.request('POST', output_destination, headers=headers, body=json_dump)
+ return result.status, result.data
def _get_nr_of_hits(elastic_json):