error conditions, debug logging

Author: minrk

ipyparallel/cluster/launcher.py

@@ -1284,6 +1284,8 @@ def _fetch_file(self, remote, local, wait=True):
                 time.sleep(1)
             elif check is True:
                 break
+            else:
+                raise ValueError(f"cmd_exists expects bool, got {check!r}")
         local_dir = os.path.dirname(local)
         ensure_dir_exists(local_dir, 700)
         check_output(self.scp_cmd + self.scp_args + [full_remote, local])
@@ -1311,10 +1313,9 @@ def start(self, hostname=None, user=None, port=None):
         # do some checks that setting are correct
         shell_info = self.ssh_sender.get_shell_info()
         python_ok = self.ssh_sender.has_python()
-        if self.log:
-            self.log.info(
-                f"ssh sender object initiated (break_away_support={self.ssh_sender.breakaway_support})"
-            )
+        self.log.debug(
+            f"ssh sender object initiated (break_away_support={self.ssh_sender.breakaway_support})"
+        )
 
         # create remote profile dir
         self.ssh_sender.check_output_python_module(
@@ -1326,11 +1327,8 @@ def start(self, hostname=None, user=None, port=None):
             env=self.get_env(),
             output_file=self.remote_output_file,
         )
-        if self.log:
-            remote_cmd = ' '.join(self.program + self.program_args)
-            self.log.info(f"Running `{remote_cmd}` (pid={self.pid})")
-            # self.log.debug("Running script via ssh:\n%s", input_script)
-            pass
+        remote_cmd = ' '.join(self.program + self.program_args)
+        self.log.debug("Running `%s` (pid=%s)", remote_cmd, self.pid)
         self.notify_start({'host': self.location, 'pid': self.pid})
         self._start_waiting()
         self.fetch_files()

ipyparallel/cluster/shellcmd.py

@@ -195,7 +195,7 @@ def _cmd_start_windows_no_breakaway(self, cmd_args, py_cmd):
         py_detached = _py_detached_tpl.format(input_json=input_json)
 
         # now start proxy process detached
-        self.log.info("[ShellCommandSend._cmd_send] starting detached process...")
+        self.log.debug("[ShellCommandSend._cmd_send] starting detached process...")
         self.log.debug("[ShellCommandSend._cmd_send] python command: \n%s", py_cmd)
         try:
             p = Popen(
@@ -206,7 +206,7 @@ def _cmd_start_windows_no_breakaway(self, cmd_args, py_cmd):
         except Exception as e:
             self.log.error(f"[ShellCommandSend._cmd_send] detached process failed: {e}")
             raise e
-        self.log.info(
+        self.log.debug(
             "[ShellCommandSend._cmd_send] detached process started successful. Waiting for redirected output (pid)..."
         )
 

ipyparallel/shellcmd.py

@@ -81,21 +81,10 @@ def main():
                 f.write(f"\t{idx}:{arg}$\n")
     del args.debug
 
-    recevier = ShellCommandReceive()
-    if cmd == "start":
-        recevier.cmd_start(**vars(args))
-    elif cmd == "running":
-        recevier.cmd_running(**vars(args))
-    elif cmd == "kill":
-        recevier.cmd_kill(**vars(args))
-    elif cmd == "mkdir":
-        recevier.cmd_mkdir(**vars(args))
-    elif cmd == "rmdir":
-        recevier.cmd_rmdir(**vars(args))
-    elif cmd == "exists":
-        recevier.cmd_exists(**vars(args))
-    elif cmd == "remove":
-        recevier.cmd_remove(**vars(args))
+    receiver = ShellCommandReceive()
+    with receiver as r:
+        recevier_method = getattr(r, f"cmd_{cmd}")
+        recevier_method(**vars(args))
 
 
 if __name__ == '__main__':