Differential D179

config: make conf file parsing less verbose in debug mode
ClosedPublic
Actions

Authored by kparal on Jul 3 2014, 11:37 AM.

Tags

None

Subscribers

Details

Reviewers

tflink
mkrizek
jskladan

Commits

rLTRN1491c5f1689c: config: make conf file parsing less verbose in debug mode

Summary

I'm trying to remove some unneded clutter.

Before:

$ runtask -i xchat-2.8.8-21.fc20 -t koji_build -a x86_64 ../task-rpmlint/rpmlint.yml --debug
[libtaskotron:config.py:156] 2014-07-03 12:17:09 DEBUG   Trying to open configuration file: /etc/taskotron/taskotron.yaml
[libtaskotron:config.py:166] 2014-07-03 12:17:09 DEBUG   Trying to parse configuration file: /etc/taskotron/taskotron.yaml
[libtaskotron:config.py:64] 2014-07-03 12:17:09 DEBUG   Using config profile: development
[libtaskotron:logger.py:109] 2014-07-03 12:17:09 DEBUG   Stream logging enabled

After:

$ runtask -i xchat-2.8.8-21.fc20 -t koji_build -a x86_64 ../task-rpmlint/rpmlint.yml --debug
[libtaskotron:config.py:93] 2014-07-03 13:31:07 DEBUG   Using config file: /etc/taskotron/taskotron.yaml
[libtaskotron:config.py:64] 2014-07-03 13:31:07 DEBUG   Using config profile: development
[libtaskotron:logger.py:109] 2014-07-03 13:31:07 DEBUG   Stream logging enabled

Test Plan

tested in action

Diff Detail

Repository

rLTRN libtaskotron

Lint

Lint Skipped

Unit

Unit Tests Skipped

kparal retitled this revision from to config: make conf file parsing less verbose in debug mode.Jul 3 2014, 11:37 AM

kparal updated this object.

kparal edited the test plan for this revision. (Show Details)

kparal added reviewers: mkrizek, jskladan, tflink.

Herald added a subscriber: tflink. · View Herald TranscriptJul 3 2014, 11:37 AM

mkrizek accepted this revision.Jul 3 2014, 11:43 AM

This revision is now accepted and ready to land.Jul 3 2014, 11:43 AM

Closed by commit rLTRN1491c5f1689c (authored by @kparal).

Revision Contents

			Path	Packages
M			libtaskotron/config.py (7 lines)

Diff 518

libtaskotron/config.py

Show First 20 Lines • Show All 85 Lines • ▼ Show 20 Line(s)		84	if config.profile == ProfileName.TESTING:
86	return config	86		return config
87		87
88	# load config files	88		# load config files
89	filename = _search_dirs(CONF_DIRS, CONF_FILE)	89		filename = _search_dirs(CONF_DIRS, CONF_FILE)
90	if not filename:	90		if not filename:
91	log.warn('No config file %s found in dirs: %s' % (CONF_FILE, CONF_DIRS))	91		log.warn('No config file %s found in dirs: %s' % (CONF_FILE, CONF_DIRS))
92	return config	92		return config
93		93
		94		log.debug('Using config file: %s', filename)
94	file_config = _load_file(filename)	95		file_config = _load_file(filename)
95	file_profile = file_config.get('profile', None)	96		file_profile = file_config.get('profile', None)
96		97
97	# reload the config defaults if the profile was specified in the config file	98		# reload the config defaults if the profile was specified in the config file
98	# (and not present in env variable)	99		# (and not present in env variable)
99	if file_profile and not env_profile:	100		if file_profile and not env_profile:
100	config = _load_defaults(file_profile)	101		config = _load_defaults(file_profile)
101		102
▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Line(s)		149	:param conf_file: file path (string) or file handler to the configuration
149	file in YAML syntax	150		file in YAML syntax
150	:return: dictionary parsed from the configuration file	151		:return: dictionary parsed from the configuration file
151	:raise TaskotronConfigError: if any problem occurs during the parsing or	152		:raise TaskotronConfigError: if any problem occurs during the parsing or
152	some values have incorrect variable type	153		some values have incorrect variable type
153	'''	154		'''
154		155
155	# convert file path to file handle if needed	156		# convert file path to file handle if needed
156	if isinstance(conf_file, basestring):	157		if isinstance(conf_file, basestring):
157	log.debug('Trying to open configuration file: %s', conf_file)
158	try:	158		try:
159	conf_file = open(conf_file)	159		conf_file = open(conf_file)
160	except IOError as e:	160		except IOError as e:
161	log.exception('Could not open configuration file: %s', conf_file)	161		log.exception('Could not open config file: %s', conf_file)
162	raise exc.TaskotronConfigError(e)	162		raise exc.TaskotronConfigError(e)
163		163
164	filename = (conf_file.name if hasattr(conf_file, 'name') else	164		filename = (conf_file.name if hasattr(conf_file, 'name') else
165	'<unnamed file>')	165		'<unnamed file>')
166	try:	166		try:
167	log.debug('Trying to parse configuration file: %s', filename)
168	conf_obj = yaml.safe_load(conf_file)	167		conf_obj = yaml.safe_load(conf_file)
169	except yaml.YAMLError as e:	168		except yaml.YAMLError as e:
170	log.exception('Could not parse configuration file: %s', filename)	169		log.exception('Could not parse config file: %s', filename)
171	raise exc.TaskotronConfigError(e)	170		raise exc.TaskotronConfigError(e)
172		171
173	# config file might be empty (all commented out), returning None. For	172		# config file might be empty (all commented out), returning None. For
174	# further processing, let's replace it with empty dict	173		# further processing, let's replace it with empty dict
175	if conf_obj is None:	174		if conf_obj is None:
176	conf_obj = {}	175		conf_obj = {}
177		176
178	# check correct types	177		# check correct types
▲ Show 20 Lines • Show All 68 Lines • Show Last 20 Lines