X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=executors.py;h=6485afa054689c3b668adb1e0708b7f2d29ed8b9;hb=e46158e49121b8a955bb07b73f5bcf9928b79c90;hp=a9d25dad50ccff1b5b85594b84184fd2982d7c49;hpb=a0722abe80c416e0c174f3ff861566834402d43b;p=python_utils.git diff --git a/executors.py b/executors.py index a9d25da..6485afa 100644 --- a/executors.py +++ b/executors.py @@ -36,7 +36,7 @@ import histogram as hist import string_utils from ansi import bg, fg, reset, underline from decorator_utils import singleton -from exec_utils import cmd_in_background, cmd_with_timeout, run_silently +from exec_utils import cmd_exitcode, cmd_in_background, run_silently from thread_utils import background_thread logger = logging.getLogger(__name__) @@ -993,7 +993,7 @@ class RemoteExecutor(BaseExecutor): self.status.record_processing_began(uuid) cmd = ( f'{SSH} {bundle.username}@{bundle.machine} ' - f'"source py38-venv/bin/activate &&' + f'"source py39-venv/bin/activate &&' f' /home/scott/lib/python_modules/remote_worker.py' f' --code_file {bundle.code_file} --result_file {bundle.result_file}"' ) @@ -1380,7 +1380,7 @@ class DefaultExecutors(object): def _ping(host) -> bool: logger.debug('RUN> ping -c 1 %s', host) try: - x = cmd_with_timeout(f'ping -c 1 {host} >/dev/null 2>/dev/null', timeout_seconds=1.0) + x = cmd_exitcode(f'ping -c 1 {host} >/dev/null 2>/dev/null', timeout_seconds=1.0) return x == 0 except Exception: return False