diff --git a/pkgs/clan-cli/clan_cli/webui/app.py b/pkgs/clan-cli/clan_cli/webui/app.py index fbc662be5..612dd1256 100644 --- a/pkgs/clan-cli/clan_cli/webui/app.py +++ b/pkgs/clan-cli/clan_cli/webui/app.py @@ -36,7 +36,7 @@ def setup_app() -> FastAPI: app.add_exception_handler( utils.NixBuildException, utils.nix_build_exception_handler ) - + app.mount("/static", StaticFiles(directory=asset_path()), name="static") for route in app.routes: diff --git a/pkgs/clan-cli/clan_cli/webui/task_manager.py b/pkgs/clan-cli/clan_cli/webui/task_manager.py index c0913e60f..c08aa8e3f 100644 --- a/pkgs/clan-cli/clan_cli/webui/task_manager.py +++ b/pkgs/clan-cli/clan_cli/webui/task_manager.py @@ -54,7 +54,7 @@ class CmdState: line = line.strip("\n") self.stderr.append(line) self.log.debug("stderr: %s", line) - self._output.put(line) + self._output.put(line + '\n') if self.p.stdout in rlist: assert self.p.stdout is not None @@ -63,7 +63,7 @@ class CmdState: line = line.strip("\n") self.stdout.append(line) self.log.debug("stdout: %s", line) - self._output.put(line) + self._output.put(line + '\n') if self.p.returncode != 0: raise RuntimeError(f"Failed to run command: {shlex.join(cmd)}") @@ -109,9 +109,9 @@ class BaseTask(threading.Thread): break if proc.done: for line in proc.stderr: - yield line + yield line + '\n' for line in proc.stdout: - yield line + yield line + '\n' continue while True: out = proc._output