Merge "Don't log file contents when loading dynamic layouts" into feature/zuulv3
This commit is contained in:
commit
4346c9c99b
|
@ -435,7 +435,7 @@ class PipelineManager(object):
|
||||||
loader = zuul.configloader.ConfigLoader()
|
loader = zuul.configloader.ConfigLoader()
|
||||||
|
|
||||||
build_set = item.current_build_set
|
build_set = item.current_build_set
|
||||||
self.log.debug("Load dynamic layout with %s" % build_set.files)
|
self.log.debug("Loading dynamic layout")
|
||||||
try:
|
try:
|
||||||
# First parse the config as it will land with the
|
# First parse the config as it will land with the
|
||||||
# full set of config and project repos. This lets us
|
# full set of config and project repos. This lets us
|
||||||
|
@ -456,13 +456,11 @@ class PipelineManager(object):
|
||||||
include_config_projects=False)
|
include_config_projects=False)
|
||||||
except zuul.configloader.ConfigurationSyntaxError as e:
|
except zuul.configloader.ConfigurationSyntaxError as e:
|
||||||
self.log.info("Configuration syntax error "
|
self.log.info("Configuration syntax error "
|
||||||
"in dynamic layout %s" %
|
"in dynamic layout")
|
||||||
build_set.files)
|
|
||||||
item.setConfigError(str(e))
|
item.setConfigError(str(e))
|
||||||
return None
|
return None
|
||||||
except Exception:
|
except Exception:
|
||||||
self.log.exception("Error in dynamic layout %s" %
|
self.log.exception("Error in dynamic layout")
|
||||||
build_set.files)
|
|
||||||
item.setConfigError("Unknown configuration error")
|
item.setConfigError("Unknown configuration error")
|
||||||
return None
|
return None
|
||||||
return layout
|
return layout
|
||||||
|
|
Loading…
Reference in New Issue