git.iko.soy/searx
on master help sign in
[mod] checker: add status and timestamp to the result
87bafbcAlexandre Flament
searx/search/checker/background.py+21−5
compare with master
unifiedsplit
@@ -35,28 +35,39 @@ def _get_every():
35
35
36
36
37def get_result():
37def get_result():
38− serialized_result = storage.get_str('CHECKER_RESULT')
38+ serialized_result = storage.get_str(CHECKER_RESULT)
39 if serialized_result is not None:
39 if serialized_result is not None:
40 return json.loads(serialized_result)
40 return json.loads(serialized_result)
41
41
42
42
43+def _set_result(result):
44+ result['timestamp'] = int(time.time() / 3600) * 3600
45+ storage.set_str(CHECKER_RESULT, json.dumps(result))
46+
47+
43def run():
48def run():
44 if not running.acquire(blocking=False):
49 if not running.acquire(blocking=False):
45 return
50 return
46 try:
51 try:
47 logger.info('Starting checker')
52 logger.info('Starting checker')
48− result = {}
53+ result = {
54+ 'status': 'ok',
55+ 'engines': {}
56+ }
49 for name, processor in processors.items():
57 for name, processor in processors.items():
50 logger.debug('Checking %s engine', name)
58 logger.debug('Checking %s engine', name)
51 checker = Checker(processor)
59 checker = Checker(processor)
52 checker.run()
60 checker.run()
53 if checker.test_results.succesfull:
61 if checker.test_results.succesfull:
54− result[name] = {'status': True}
62+ result['engines'][name] = {'success': True}
55 else:
63 else:
56− result[name] = {'status': False, 'errors': checker.test_results.errors}
64+ result['engines'][name] = {'success': False, 'errors': checker.test_results.errors}
57
65
58− storage.set_str('CHECKER_RESULT', json.dumps(result))
66+ _set_result(result)
59 logger.info('Check done')
67 logger.info('Check done')
68+ except Exception:
69+ _set_result({'status': 'error'})
70+ logger.exception('Error while running the checker')
60 finally:
71 finally:
61 running.release()
72 running.release()
62
73
@@ -85,6 +96,9 @@ def initialize():
85 logger.info('Send SIGUSR1 signal to pid %i to start the checker', os.getpid())
96 logger.info('Send SIGUSR1 signal to pid %i to start the checker', os.getpid())
86 signal.signal(signal.SIGUSR1, _signal_handler)
97 signal.signal(signal.SIGUSR1, _signal_handler)
87
98
99+ # disabled by default
100+ _set_result({'status': 'disabled'})
101+
88 # special case when debug is activate
102 # special case when debug is activate
89 if searx_debug and settings.get('checker', {}).get('off_when_debug', True):
103 if searx_debug and settings.get('checker', {}).get('off_when_debug', True):
90 logger.info('debug mode: checker is disabled')
104 logger.info('debug mode: checker is disabled')
@@ -97,6 +111,8 @@ def initialize():
97 return
111 return
98
112
99 #
113 #
114+ _set_result({'status': 'unknow'})
115+
100 start_after = scheduling.get('start_after', (300, 1800))
116 start_after = scheduling.get('start_after', (300, 1800))
101 start_after = _get_interval(start_after, 'checker.scheduling.start_after is not a int or list')
117 start_after = _get_interval(start_after, 'checker.scheduling.start_after is not a int or list')
102 delay = random.randint(start_after[0], start_after[1])
118 delay = random.randint(start_after[0], start_after[1])