forked from ungleich-public/cdist
add filter to prepend hostname in config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
35bfa2fcdc
commit
92d3925b1c
1 changed files with 11 additions and 2 deletions
|
@ -53,6 +53,9 @@ class ConfigInstall:
|
||||||
# Required for testing
|
# Required for testing
|
||||||
self.exec_path = exec_path
|
self.exec_path = exec_path
|
||||||
|
|
||||||
|
# Configure logging
|
||||||
|
log.addFilter(self)
|
||||||
|
|
||||||
# Base and Temp Base
|
# Base and Temp Base
|
||||||
if base_path:
|
if base_path:
|
||||||
self.base_path = base_path
|
self.base_path = base_path
|
||||||
|
@ -106,6 +109,7 @@ class ConfigInstall:
|
||||||
self.__init_remote_paths()
|
self.__init_remote_paths()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def __init_remote_paths(self):
|
def __init_remote_paths(self):
|
||||||
"""Initialise remote directory structure"""
|
"""Initialise remote directory structure"""
|
||||||
self.remove_remote_path(self.remote_base_path)
|
self.remove_remote_path(self.remote_base_path)
|
||||||
|
@ -139,8 +143,13 @@ class ConfigInstall:
|
||||||
shutil.rmtree(self.cache_path)
|
shutil.rmtree(self.cache_path)
|
||||||
shutil.move(self.out_path, self.cache_path)
|
shutil.move(self.out_path, self.cache_path)
|
||||||
|
|
||||||
def logfilter(self):
|
def filter(self, record):
|
||||||
"""Add hostname to logs"""
|
"""Add hostname to logs via logging Filter"""
|
||||||
|
|
||||||
|
record.msg = self.target_host + ": " + record.msg
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
def run_initial_manifest(self):
|
def run_initial_manifest(self):
|
||||||
"""Run the initial manifest"""
|
"""Run the initial manifest"""
|
||||||
|
|
Loading…
Reference in a new issue