clan-cli: Refactor ssh part 2, Refactor custom_logger

This commit is contained in:
Qubasa
2024-11-22 22:08:50 +01:00
parent 05b31c7195
commit 8866a85765
23 changed files with 713 additions and 1255 deletions

View File

@@ -1,8 +1,8 @@
import argparse
import json
import subprocess
from dataclasses import dataclass
from clan_cli.cmd import Log
from clan_cli.completions import (
add_dynamic_completer,
complete_backup_providers_for_machine,
@@ -23,7 +23,7 @@ def list_provider(machine: Machine, provider: str) -> list[Backup]:
backup_metadata = json.loads(machine.eval_nix("config.clan.core.backups"))
proc = machine.target_host.run(
[backup_metadata["providers"][provider]["list"]],
stdout=subprocess.PIPE,
log=Log.STDERR,
check=False,
)
if proc.returncode != 0:

View File

@@ -1,7 +1,7 @@
import argparse
import json
import subprocess
from clan_cli.cmd import Log
from clan_cli.completions import (
add_dynamic_completer,
complete_backup_providers_for_machine,
@@ -28,7 +28,7 @@ def restore_service(machine: Machine, name: str, provider: str, service: str) ->
if pre_restore := backup_folders[service]["preRestoreCommand"]:
proc = machine.target_host.run(
[pre_restore],
stdout=subprocess.PIPE,
log=Log.STDERR,
extra_env=env,
)
if proc.returncode != 0:
@@ -37,7 +37,7 @@ def restore_service(machine: Machine, name: str, provider: str, service: str) ->
proc = machine.target_host.run(
[backup_metadata["providers"][provider]["restore"]],
stdout=subprocess.PIPE,
log=Log.STDERR,
extra_env=env,
)
if proc.returncode != 0:
@@ -47,7 +47,7 @@ def restore_service(machine: Machine, name: str, provider: str, service: str) ->
if post_restore := backup_folders[service]["postRestoreCommand"]:
proc = machine.target_host.run(
[post_restore],
stdout=subprocess.PIPE,
log=Log.STDERR,
extra_env=env,
)
if proc.returncode != 0: