yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clan-cli: Replace log.info to machine.info if applicable

Browse Source
This commit is contained in:
Qubasa
2024-12-12 15:35:26 +01:00
parent ffdf9d37f8
commit b9091beff9
17 changed files with 126 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/clan-cli/clan_cli/vars/check.py
View File

@@ -60,7 +60,7 @@ def vars_status(machine: Machine, generator_name: None | str = None) -> VarStatu
if file.secret:
if not secret_vars_store.exists(generator, file.name):
log.info(
machine.info(
f"Secret var '{file.name}' for service '{generator.name}' in machine {machine.name} is missing."
)
missing_secret_vars.append(file)
@@ -70,13 +70,13 @@ def vars_status(machine: Machine, generator_name: None | str = None) -> VarStatu
file_name=file.name,
)
if msg:
log.info(
machine.info(
f"Secret var '{file.name}' for service '{generator.name}' in machine {machine.name} needs update: {msg}"
)
unfixed_secret_vars.append(file)
elif not public_vars_store.exists(generator, file.name):
log.info(
machine.info(
f"Public var '{file.name}' for service '{generator.name}' in machine {machine.name} is missing."
)
missing_public_vars.append(file)
@@ -86,13 +86,13 @@ def vars_status(machine: Machine, generator_name: None | str = None) -> VarStatu
and public_vars_store.hash_is_valid(generator)
):
invalid_generators.append(generator.name)
log.info(
machine.info(
f"Generator '{generator.name}' in machine {machine.name} has outdated invalidation hash."
)
log.debug(f"missing_secret_vars: {missing_secret_vars}")
log.debug(f"missing_public_vars: {missing_public_vars}")
log.debug(f"unfixed_secret_vars: {unfixed_secret_vars}")
log.debug(f"invalid_generators: {invalid_generators}")
machine.debug(f"missing_secret_vars: {missing_secret_vars}")
machine.debug(f"missing_public_vars: {missing_public_vars}")
machine.debug(f"unfixed_secret_vars: {unfixed_secret_vars}")
machine.debug(f"invalid_generators: {invalid_generators}")
return VarStatus(
missing_secret_vars,
missing_public_vars,

4
pkgs/clan-cli/clan_cli/vars/generate.py
View File

@@ -283,13 +283,13 @@ def _migration_file_exists(
if is_secret:
if machine.secret_facts_store.exists(generator.name, fact_name):
return True
log.debug(
machine.debug(
f"Cannot migrate fact {fact_name} for service {generator.name}, as it does not exist in the secret fact store"
)
if not is_secret:
if machine.public_facts_store.exists(generator.name, fact_name):
return True
log.debug(
machine.debug(
f"Cannot migrate fact {fact_name} for service {generator.name}, as it does not exist in the public fact store"
)
return False

2
pkgs/clan-cli/clan_cli/vars/public_modules/vm.py
View File

@@ -19,7 +19,7 @@ class FactStore(StoreBase):
self.machine = machine
self.works_remotely = False
self.dir = vm_state_dir(machine.flake, machine.name) / "facts"
log.debug(f"FactStore initialized with dir {self.dir}")
machine.debug(f"FactStore initialized with dir {self.dir}")
@property
def store_name(self) -> str: