Skip to content

Commit 55912b9

Browse files
ekoutsvkarak
authored andcommitted
log sanity results for httpjson handler
1 parent 6faf9c7 commit 55912b9

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

reframe/core/logging.py

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,7 @@ def _create_httpjson_handler(site_config, config_prefix):
604604
debug = site_config.get(f'{config_prefix}/debug')
605605
backoff_intervals = site_config.get(f'{config_prefix}/backoff_intervals')
606606
retry_timeout = site_config.get(f'{config_prefix}/retry_timeout')
607+
log_sanity_results = site_config.get(f'{config_prefix}/log_sanity_results')
607608

608609
parsed_url = urllib.parse.urlparse(url)
609610
if parsed_url.scheme not in {'http', 'https'}:
@@ -646,7 +647,7 @@ def _create_httpjson_handler(site_config, config_prefix):
646647

647648
return HTTPJSONHandler(url, extras, ignore_keys, json_formatter,
648649
extra_headers, debug, backoff_intervals,
649-
retry_timeout)
650+
retry_timeout, log_sanity_results)
650651

651652

652653
def _record_to_json(record, extras, ignore_keys):
@@ -697,7 +698,8 @@ class HTTPJSONHandler(logging.Handler):
697698

698699
def __init__(self, url, extras=None, ignore_keys=None,
699700
json_formatter=None, extra_headers=None,
700-
debug=False, backoff_intervals=(1, 2, 3), retry_timeout=0):
701+
debug=False, backoff_intervals=(1, 2, 3), retry_timeout=0,
702+
log_sanity_results=False):
701703
super().__init__()
702704
self._url = url
703705
self._extras = extras
@@ -723,6 +725,7 @@ def __init__(self, url, extras=None, ignore_keys=None,
723725
self._debug = debug
724726
self._timeout = retry_timeout
725727
self._backoff_intervals = backoff_intervals
728+
self._log_sanity_results = log_sanity_results
726729

727730
def emit(self, record):
728731
# Convert tags to a list to make them JSON friendly
@@ -934,7 +937,11 @@ def _update_check_extras(self):
934937
)
935938

936939
def log_performance(self, level, task, msg=None, multiline=False):
937-
if self.check is None or not self.check.is_performance_check():
940+
if (
941+
self.check is None or
942+
not self.check.is_performance_check() and
943+
not self.logger._log_sanity_results
944+
):
938945
return
939946

940947
_, part, env = task.testcase
@@ -963,6 +970,16 @@ def log_performance(self, level, task, msg=None, multiline=False):
963970
self.extra['check_perf_unit'] = unit
964971
self.extra['check_perf_result'] = result
965972
self.log(level, msg)
973+
974+
if not self.check.perfvalues:
975+
self.extra['check_perf_var'] = "$sanity_dummy"
976+
self.extra['check_perf_value'] = None
977+
self.extra['check_perf_ref'] = None
978+
self.extra['check_perf_lower_thres'] = None
979+
self.extra['check_perf_upper_thres'] = None
980+
self.extra['check_perf_unit'] = None
981+
self.extra['check_perf_result'] = None
982+
self.log(level, msg)
966983
else:
967984
self.log(level, msg)
968985

reframe/schemas/config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@
181181
"type": "array",
182182
"items": {"type": "number"}
183183
},
184+
"log_sanity_results": {"type": "boolean"},
184185
"retry_timeout": {"type": "number"}
185186
},
186187
"required": ["url"]

0 commit comments

Comments
 (0)