projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a newly introduced bug in run_tests.sh.
[python_utils.git]
/
remote_worker.py
diff --git
a/remote_worker.py
b/remote_worker.py
index bf8de6c66a36767ac267cfdd2bffe38317cbace0..211b2132ff07c8ef0caa54b4b68e89e3fe7c8caf 100755
(executable)
--- a/
remote_worker.py
+++ b/
remote_worker.py
@@
-6,7
+6,6
@@
results.
import logging
import os
import logging
import os
-import platform
import signal
import threading
import sys
import signal
import threading
import sys
@@
-44,16
+43,13
@@
cfg.add_argument(
cfg.add_argument(
'--watch_for_cancel',
action=argparse_utils.ActionNoYes,
cfg.add_argument(
'--watch_for_cancel',
action=argparse_utils.ActionNoYes,
- default=
Fals
e,
+ default=
Tru
e,
help='Should we watch for the cancellation of our parent ssh process?'
)
@background_thread
def watch_for_cancel(terminate_event: threading.Event) -> None:
help='Should we watch for the cancellation of our parent ssh process?'
)
@background_thread
def watch_for_cancel(terminate_event: threading.Event) -> None:
- if platform.node() == 'VIDEO-COMPUTER':
- logger.warning('Background thread not allowed on retarded computers, sorry.')
- return
logger.debug('Starting up background thread...')
p = psutil.Process(os.getpid())
while True:
logger.debug('Starting up background thread...')
p = psutil.Process(os.getpid())
while True:
@@
-83,7
+79,9
@@
def main() -> None:
in_file = config.config['code_file']
out_file = config.config['result_file']
in_file = config.config['code_file']
out_file = config.config['result_file']
- (thread, stop_thread) = watch_for_cancel()
+ stop_thread = None
+ if config.config['watch_for_cancel']:
+ (thread, stop_thread) = watch_for_cancel()
logger.debug(f'Reading {in_file}.')
try:
logger.debug(f'Reading {in_file}.')
try:
@@
-129,8
+127,9
@@
def main() -> None:
stop_thread.set()
sys.exit(-1)
stop_thread.set()
sys.exit(-1)
- stop_thread.set()
- thread.join()
+ if stop_thread is not None:
+ stop_thread.set()
+ thread.join()
if __name__ == '__main__':
if __name__ == '__main__':