_re_inet = re.compile("\d+:\s+(?P<name>[a-z0-9_-]+)\s+inet6?\s+(?P<inet>[a-f0-9.:/]+)\s+(brd\s+[0-9.]+)?.*scope\s+global.*")
+# to debug, just use
+# logging.getLogger('sshfuncs').setLevel(logging.DEBUG)
logger = logging.getLogger("sshfuncs")
def log(msg, level = logging.DEBUG, out = None, err = None):
if out:
- msg += " - OUT: {} ".format(out)
+ msg += " - OUT is {} long".format(len(out))
if err:
- msg += " - ERROR: {} ".format(err)
+ msg += " - ERR is {} long".format(len(err))
logger.log(level, msg)
if hasattr(os, "devnull"):
args.append(command)
- log_msg = " rexec - host {} - command {} ".format(host, " ".join(map(str, args)))
+ log_msg = " rexec - host {} - command {} ".format(host, pretty_args(args))
stdout = stderr = stdin = subprocess.PIPE
if forward_x11:
stdout = stderr = stdin = None
return _retry_rexec(args, log_msg,
- stderr = stderr,
- stdin = stdin,
- stdout = stdout,
+ stdin = stdin, stdout = stdout, stderr = stderr,
env = env,
retry = retry,
tmp_known_hosts = tmp_known_hosts,
else:
args.append(dest)
- log_msg = " rcopy - host {} - command {} ".format(host, " ".join(map(str, args)))
+ log_msg = " rcopy - host {} - command {} ".format(host, pretty_args(args))
return _retry_rexec(args, log_msg, env = None, retry = retry,
tmp_known_hosts = tmp_known_hosts,
proc.stdout.close()
read_set.remove(proc.stdout)
stdout.append(data)
+ log("have read {} bytes from stdout".format(len(stdout)))
# likewise
if proc.stderr in rlist:
proc.stderr.close()
read_set.remove(proc.stderr)
stderr.append(data)
+ log("have read {} bytes from stderr".format(len(stdout)))
# All data exchanged. Translate lists into strings.
if stdout is not None: