almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Log and exit on metadata update errors at startup

Browse Source 
A bad system repo can cause lorax-composer to fail to start. Instead of
a traceback log the error and exit.

(note that the exit still results in an OSError traceback due to part of
it running as root, this needs to be addressed in another commit).

(cherry picked from commit 49380b4b49)
This commit is contained in:
Brian C. Lane 2018-07-18 16:09:03 -07:00
parent ea5e34e9c6
commit d50321239c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pylorax/api/dnfbase.py
View File

@ -82,7 +82,11 @@ def get_base_object(conf):
# Update the metadata from the enabled repos to speed up later operations # Update the metadata from the enabled repos to speed up later operations
log.info("Updating repository metadata") log.info("Updating repository metadata")
try:
dbo.fill_sack(load_system_repo=False) dbo.fill_sack(load_system_repo=False)
dbo.read_comps() dbo.read_comps()
except dnf.exceptions.Error as e:
log.error("Failed to update metadata: %s", str(e))
raise RuntimeError("Fetching metadata failed: %s" % str(e))
return dbo return dbo

4
src/sbin/lorax-composer
View File

@ -245,7 +245,11 @@ if __name__ == '__main__':
make_dnf_dirs(server.config["COMPOSER_CFG"]) make_dnf_dirs(server.config["COMPOSER_CFG"])
# Get a dnf.Base to share with the requests # Get a dnf.Base to share with the requests
try:
dbo = get_base_object(server.config["COMPOSER_CFG"]) dbo = get_base_object(server.config["COMPOSER_CFG"])
except RuntimeError:
# Error has already been logged. Just exit cleanly.
sys.exit(1)
server.config["DNFLOCK"] = DNFLock(dbo=dbo, lock=Lock()) server.config["DNFLOCK"] = DNFLock(dbo=dbo, lock=Lock())
# Depsolve the templates and make a note of the failures for /api/status to report # Depsolve the templates and make a note of the failures for /api/status to report