diff --git a/minerva/remote.py b/minerva/remote.py index 86d4fb0..37397cc 100644 --- a/minerva/remote.py +++ b/minerva/remote.py @@ -88,26 +88,26 @@ class Remote: return d.Docker(machine = self, *args, **kwargs) - def stream_logs(self, job_id=None, hold_open=False): - ls = Logset(self, job_id, hold_open) + def stream_logs(self, job_id=None, cleanup=True): + ls = Logset(self, job_id, cleanup) self.logsets.append(ls) return ls def track_docker_events(self): - with self.stream_logs(hold_open = True) as logset: + with self.stream_logs(cleanup = False) as logset: print(f"docker events at: {logset[0].name}") self.docker_events = self.cmd("docker events", disown=True, logset=logset) class Logset: - def __init__(self, machine, job_id=None, hold_open=False): + def __init__(self, machine, job_id=None, cleanup=True): self.job_id = job_id or "job-%0.6f" % random.random() self.machine = machine self.directory = f"/tmp/{machine.ip}" self.stdout = None self.stderr = None - self.hold_open = hold_open # useful for getting a logset for a background command + self.cleanup = cleanup # useful for getting a logset for a background command def __enter__(self): @@ -127,7 +127,7 @@ class Logset: def __exit__(self, exception_type, exception_value, exception_traceback): - if not self.hold_open: + if self.cleanup: self.stdout.close() self.stderr.close()