tabulon/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

start moving info log messages to verbose

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2017-07-03 13:32:39 +02:00
commit f6e1174adb
4 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cdist/config.py
View file

@ -166,7 +166,7 @@ class Config(object):
failed_hosts.append(host) failed_hosts.append(host)
time_end = time.time() time_end = time.time()
log.info("Total processing time for %s host(s): %s", hostcnt, log.verbose("Total processing time for %s host(s): %s", hostcnt,
(time_end - time_start)) (time_end - time_start))
if len(failed_hosts) > 0: if len(failed_hosts) > 0:
@ -466,8 +466,8 @@ class Config(object):
def object_prepare(self, cdist_object): def object_prepare(self, cdist_object):
"""Prepare object: Run type explorer + manifest""" """Prepare object: Run type explorer + manifest"""
self.log.info("Preparing object {}".format(cdist_object.name)) self.log.verbose("Preparing object {}".format(cdist_object.name))
self.log.info( self.log.verbose(
"Running manifest and explorers for " + cdist_object.name) "Running manifest and explorers for " + cdist_object.name)
self.explorer.run_type_explorers(cdist_object) self.explorer.run_type_explorers(cdist_object)
self.manifest.run_type_manifest(cdist_object) self.manifest.run_type_manifest(cdist_object)
@ -476,8 +476,7 @@ class Config(object):
def object_run(self, cdist_object): def object_run(self, cdist_object):
"""Run gencode and code for an object""" """Run gencode and code for an object"""
self.log.info("Running object " + cdist_object.name) self.log.verbose("Running object " + cdist_object.name)
self.log.verbose("Trying to run object %s" % (cdist_object.name))
if cdist_object.state == core.CdistObject.STATE_DONE: if cdist_object.state == core.CdistObject.STATE_DONE:
raise cdist.Error(("Attempting to run an already finished " raise cdist.Error(("Attempting to run an already finished "
"object: %s"), cdist_object) "object: %s"), cdist_object)
@ -494,7 +493,7 @@ class Config(object):
# Execute # Execute
if not self.dry_run: if not self.dry_run:
if cdist_object.code_local or cdist_object.code_remote: if cdist_object.code_local or cdist_object.code_remote:
self.log.info("Executing code for %s" % (cdist_object.name)) self.log.info("Updating %s" % (cdist_object.name))
if cdist_object.code_local: if cdist_object.code_local:
self.log.trace("Executing local code for %s" self.log.trace("Executing local code for %s"
% (cdist_object.name)) % (cdist_object.name))
@ -505,7 +504,7 @@ class Config(object):
self.code.transfer_code_remote(cdist_object) self.code.transfer_code_remote(cdist_object)
self.code.run_code_remote(cdist_object) self.code.run_code_remote(cdist_object)
else: else:
self.log.info("Skipping code execution due to DRY RUN") self.log.verbose("Skipping code execution due to DRY RUN")
# Mark this object as done # Mark this object as done
self.log.trace("Finishing run of " + cdist_object.name) self.log.trace("Finishing run of " + cdist_object.name)

4
cdist/core/explorer.py
View file

@ -95,7 +95,7 @@ class Explorer(object):
out_path directory. out_path directory.
""" """
self.log.info("Running global explorers") self.log.verbose("Running global explorers")
self.transfer_global_explorers() self.transfer_global_explorers()
if self.jobs is None: if self.jobs is None:
self._run_global_explorers_seq(out_path) self._run_global_explorers_seq(out_path)
@ -168,7 +168,7 @@ class Explorer(object):
in the object. in the object.
""" """
self.log.info("Running type explorers for {}".format( self.log.verbose("Running type explorers for {}".format(
cdist_object.cdist_type)) cdist_object.cdist_type))
self.log.trace("Transfering type explorers for type: %s", self.log.trace("Transfering type explorers for type: %s",
cdist_object.cdist_type) cdist_object.cdist_type)

4
cdist/core/manifest.py
View file

@ -149,7 +149,7 @@ class Manifest(object):
raise NoInitialManifestError(initial_manifest, user_supplied) raise NoInitialManifestError(initial_manifest, user_supplied)
message_prefix = "initialmanifest" message_prefix = "initialmanifest"
self.log.info("Running initial manifest " + initial_manifest) self.log.verbose("Running initial manifest " + initial_manifest)
self.local.run_script(initial_manifest, self.local.run_script(initial_manifest,
env=self.env_initial_manifest(initial_manifest), env=self.env_initial_manifest(initial_manifest),
message_prefix=message_prefix, message_prefix=message_prefix,
@ -176,7 +176,7 @@ class Manifest(object):
cdist_object.cdist_type.manifest_path) cdist_object.cdist_type.manifest_path)
message_prefix = cdist_object.name message_prefix = cdist_object.name
if os.path.isfile(type_manifest): if os.path.isfile(type_manifest):
self.log.info("Running type manifest " + type_manifest) self.log.verbose("Running type manifest " + type_manifest)
self.local.run_script(type_manifest, self.local.run_script(type_manifest,
env=self.env_type_manifest(cdist_object), env=self.env_type_manifest(cdist_object),
message_prefix=message_prefix, message_prefix=message_prefix,

2
scripts/cdist
View file

@ -42,7 +42,7 @@ def commandline():
# Loglevels are handled globally in here # Loglevels are handled globally in here
cdist.argparse.handle_loglevel(args) cdist.argparse.handle_loglevel(args)
log.info("version %s" % cdist.VERSION) log.verbose("version %s" % cdist.VERSION)
log.trace(args) log.trace(args)
# Work around python 3.3 bug: # Work around python 3.3 bug: