cmdeploy: call LocalExec directly, not .logged()

Author: missytake

cmdeploy/src/cmdeploy/cmdeploy.py

@@ -192,7 +192,7 @@ def status_cmd(args, out):
     else:
         out.red("no privacy settings")
 
-    for line in sshexec.logged(remote.rshell.get_systemd_running, {}):
+    for line in sshexec(remote.rshell.get_systemd_running):
         print(line)
 
 

cmdeploy/src/cmdeploy/sshexec.py

@@ -89,6 +89,11 @@ def __init__(self, verbose=False, docker=False):
         self.verbose = verbose
         self.docker = docker
 
+    def __call__(self, call, kwargs=None, log_callback=None):
+        if kwargs is None:
+            kwargs = {}
+        return call(**kwargs)
+
     def logged(self, call, kwargs: dict):
         where = "locally"
         if self.docker:

cmdeploy/src/cmdeploy/tests/online/test_1_basic.py

@@ -16,12 +16,12 @@ def sshexec(self, sshdomain):
         return get_sshexec(sshdomain)
 
     def test_ls(self, sshexec):
-        out = sshexec.logged(call=remote.rdns.shell, kwargs=dict(command="ls"))
-        out2 = sshexec.logged(call=remote.rdns.shell, kwargs=dict(command="ls"))
+        out = sshexec(call=remote.rdns.shell, kwargs=dict(command="ls"))
+        out2 = sshexec(call=remote.rdns.shell, kwargs=dict(command="ls"))
         assert out == out2
 
     def test_perform_initial(self, sshexec, maildomain):
-        res = sshexec.logged(
+        res = sshexec(
             remote.rdns.perform_initial_checks, kwargs=dict(mail_domain=maildomain)
         )
         assert res["A"] or res["AAAA"]
@@ -61,7 +61,7 @@ def test_exception(self, sshexec, capsys):
     def test_opendkim_restarted(self, sshexec):
         """check that opendkim is not running for longer than a day."""
         cmd = "systemctl show opendkim --timestamp=utc --property=ActiveEnterTimestamp"
-        out = sshexec.logged(call=remote.rshell.shell, kwargs=dict(command=cmd))
+        out = sshexec(call=remote.rshell.shell, kwargs=dict(command=cmd))
         datestring = out.split("=")[1]
         since_date = datetime.datetime.strptime(datestring, "%a %Y-%m-%d %H:%M:%S %Z")
         now = datetime.datetime.now(since_date.tzinfo)