swh/core/config.py
101	That's an info at best, as it'd log an error message if a config file voluntarily doesn't exist (e.g. during tests). `exists_accessible` already raises relevant errors when a file is present but inaccessible.

This revision now requires changes to proceed.Dec 21 2018, 3:17 PM

That's an info at best, as it'd log an error message if a config file voluntarily doesn't exist (e.g. during tests).

exists_accessible already raises relevant errors when a file is present but inaccessible.

We agreed that tests should not try to load config files. And allowing config files to be missing without reporting errors is asking for trouble.

In D878#18891, @vlorentz wrote:

That's an info at best, as it'd log an error message if a config file voluntarily doesn't exist (e.g. during tests).

exists_accessible already raises relevant errors when a file is present but inaccessible.

We agreed that tests should not try to load config files.

Okay?

And allowing config files to be missing without reporting errors is asking for trouble.

All the systems currently in production depend on this behavior: they try to load local configuration (in ~/.config), which fails (expectedly!), then they load the configuration in /etc.

All in all I don't think all workers should immediately start spewing a handful of error messages at each run for something that is _expected_.

I'd even go as far as putting those messages at DEBUG level.

In D878#19188, @olasd wrote:

All the systems currently in production depend on this behavior: they try to load local configuration (in ~/.config), which fails (expectedly!), then they load the configuration in /etc.

Indeed, I forgot about that.

Lower log levels.

olasd accepted this revision.Jan 9 2019, 2:24 PM

This revision is now accepted and ready to land.Jan 9 2019, 2:24 PM

Build is green
See https://jenkins.softwareheritage.org/job/DCORE/job/tox/116/ for more details.

Harbormaster completed remote builds in B3296: Diff 2838.Jan 9 2019, 2:26 PM

rebase / squash

Closed by commit rDCORE24f9d5ee2b73: Log used config files. (authored by vlorentz). · Explain WhyJan 9 2019, 2:26 PM

This revision was automatically updated to reflect the committed changes.

Harbormaster failed remote builds in B3297: Diff 2839!Jan 9 2019, 2:27 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DCORE/job/tox/119/
See console output for more information: https://jenkins.softwareheritage.org/job/DCORE/job/tox/119/console

Revision Contents
Changeset List

Path

Size

swh/

core/

config.py

5 lines

Diff 2840

View Options

swh/core/config.py

	# Copyright (C) 2015 The Software Heritage developers			# Copyright (C) 2015 The Software Heritage developers
	# See the AUTHORS file at the top-level directory of this distribution			# See the AUTHORS file at the top-level directory of this distribution
	# License: GNU General Public License version 3, or any later version			# License: GNU General Public License version 3, or any later version
	# See top-level LICENSE file for more information			# See top-level LICENSE file for more information

	import configparser			import configparser
				import logging
	import os			import os
	import yaml			import yaml


	SWH_CONFIG_DIRECTORIES = [			SWH_CONFIG_DIRECTORIES = [
	'~/.config/swh',			'~/.config/swh',
	'~/.swh',			'~/.swh',
	'/etc/softwareheritage',			'/etc/softwareheritage',
	▲ Show 20 Lines • Show All 64 Lines • ▼ Show 20 Lines
	def read_raw_config(base_config_path):			def read_raw_config(base_config_path):
	"""Read the raw config corresponding to base_config_path.			"""Read the raw config corresponding to base_config_path.

	Can read yml or ini files.			Can read yml or ini files.
	"""			"""

	yml_file = base_config_path + '.yml'			yml_file = base_config_path + '.yml'
	if exists_accessible(yml_file):			if exists_accessible(yml_file):
				logging.debug('Using config file %s', yml_file)
	with open(yml_file) as f:			with open(yml_file) as f:
	return yaml.safe_load(f)			return yaml.safe_load(f)

	ini_file = base_config_path + '.ini'			ini_file = base_config_path + '.ini'
	if exists_accessible(ini_file):			if exists_accessible(ini_file):
	config = configparser.ConfigParser()			config = configparser.ConfigParser()
	config.read(ini_file)			config.read(ini_file)
	if 'main' in config._sections:			if 'main' in config._sections:
				logging.debug('Using config file %s', ini_file)
	return config._sections['main']			return config._sections['main']
				else:
				logging.debug('Ignoring config file %s (no [main])', ini_file)

				olasdUnsubmitted Not Done Inline Actions That's an info at best, as it'd log an error message if a config file voluntarily doesn't exist (e.g. during tests). `exists_accessible` already raises relevant errors when a file is present but inaccessible. olasd: That's an info at best, as it'd log an error message if a config file voluntarily doesn't exist…
	return {}			return {}


	def config_exists(config_path):			def config_exists(config_path):
	"""Check whether the given config exists"""			"""Check whether the given config exists"""
	basepath = config_basepath(config_path)			basepath = config_basepath(config_path)
	return any(exists_accessible(basepath + extension)			return any(exists_accessible(basepath + extension)
	for extension in SWH_CONFIG_EXTENSIONS)			for extension in SWH_CONFIG_EXTENSIONS)
	▲ Show 20 Lines • Show All 172 Lines • Show Last 20 Lines

Log used config files.ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 2840

swh/core/config.py

Log used config files.
ClosedPublic
Actions

Revision Contents
Changeset List