on master help sign in
[mod] checker: add status and timestamp to the result

for each engine: replace status by success

commit87bafbc32b34ef7f3033bdea6a4bfa966a6068c1 authorAlexandre Flament <alex@al-f.net> dateMon 11 Jan 2021, 18:43 (6 years ago) parentf3e1bd3
1 file changed+21−5
searx/search/checker/background.py+21−5
searx/search/checker/background.py+21−5
@@ -35,28 +35,39 @@ def _get_every():
3535
3636
3737def get_result():
38− serialized_result = storage.get_str('CHECKER_RESULT')
38+ serialized_result = storage.get_str(CHECKER_RESULT)
3939 if serialized_result is not None:
4040 return json.loads(serialized_result)
4141
4242
43+def _set_result(result):
44+ result['timestamp'] = int(time.time() / 3600) * 3600
45+ storage.set_str(CHECKER_RESULT, json.dumps(result))
46+
47+
4348def run():
4449 if not running.acquire(blocking=False):
4550 return
4651 try:
4752 logger.info('Starting checker')
48− result = {}
53+ result = {
54+ 'status': 'ok',
55+ 'engines': {}
56+ }
4957 for name, processor in processors.items():
5058 logger.debug('Checking %s engine', name)
5159 checker = Checker(processor)
5260 checker.run()
5361 if checker.test_results.succesfull:
54− result[name] = {'status': True}
62+ result['engines'][name] = {'success': True}
5563 else:
56− result[name] = {'status': False, 'errors': checker.test_results.errors}
64+ result['engines'][name] = {'success': False, 'errors': checker.test_results.errors}
5765
58− storage.set_str('CHECKER_RESULT', json.dumps(result))
66+ _set_result(result)
5967 logger.info('Check done')
68+ except Exception:
69+ _set_result({'status': 'error'})
70+ logger.exception('Error while running the checker')
6071 finally:
6172 running.release()
6273
@@ -85,6 +96,9 @@ def initialize():
8596 logger.info('Send SIGUSR1 signal to pid %i to start the checker', os.getpid())
8697 signal.signal(signal.SIGUSR1, _signal_handler)
8798
99+ # disabled by default
100+ _set_result({'status': 'disabled'})
101+
88102 # special case when debug is activate
89103 if searx_debug and settings.get('checker', {}).get('off_when_debug', True):
90104 logger.info('debug mode: checker is disabled')
@@ -97,6 +111,8 @@ def initialize():
97111 return
98112
99113 #
114+ _set_result({'status': 'unknow'})
115+
100116 start_after = scheduling.get('start_after', (300, 1800))
101117 start_after = _get_interval(start_after, 'checker.scheduling.start_after is not a int or list')
102118 delay = random.randint(start_after[0], start_after[1])