Merge pull request 'clan-cli: improve debug logging' (#415) from DavHau-dave into main

pkgs/clan-cli/clan_cli/__init__.py

@@ -4,7 +4,6 @@ from types import ModuleType
 from typing import Optional
 
 from . import config, create, join, machines, secrets, vms, webui
-from .errors import ClanError
 from .ssh import cli as ssh_cli
 
 argcomplete: Optional[ModuleType] = None
@@ -68,11 +67,8 @@ def main() -> None:
 
     if not hasattr(args, "func"):
         return
-    try:
-        args.func(args)
-    except ClanError as e:
-        print(e, file=sys.stderr)
-        sys.exit(1)
+
+    args.func(args)
 
 
 if __name__ == "__main__":

pkgs/clan-cli/clan_cli/join/__init__.py

@@ -9,7 +9,7 @@ def join(args: argparse.Namespace) -> None:
     # start webui in background
     uri = args.flake_uri.removeprefix("clan://")
     subprocess.run(
-        ["clan", "webui", f"/join?flake={urllib.parse.quote_plus(uri)}"],
+        ["clan", "--debug", "webui", f"/join?flake={urllib.parse.quote_plus(uri)}"],
         # stdout=sys.stdout,
         # stderr=sys.stderr,
     )

pkgs/clan-cli/clan_cli/task_manager.py

@@ -51,10 +51,10 @@ class Command:
                 try:
                     for line in fd:
                         if fd == self.p.stderr:
-                            self.log.debug(f"[{cmd[0]}] stderr: {line}")
+                            print(f"[{cmd[0]}] stderr: {line}")
                             self.stderr.append(line)
                         else:
-                            self.log.debug(f"[{cmd[0]}] stdout: {line}")
+                            print(f"[{cmd[0]}] stdout: {line}")
                             self.stdout.append(line)
                         self._output.put(line)
                 except BlockingIOError:

pkgs/clan-cli/default.nix

@@ -177,7 +177,7 @@ python3.pkgs.buildPythonApplication {
   desktopItems = [
     (makeDesktopItem {
       name = "clan";
-      exec = "clan join %u";
+      exec = "clan --debug join %u";
       desktopName = "CLan Manager";
       startupWMClass = "clan";
       mimeTypes = [ "x-scheme-handler/clan" ];