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

Improve logging for template syntax errors

Browse Source 
The shlex splitting can fail, resulting in error messages like:

ERROR livemedia-creator: No closing quotation

without any context in the log files. This logs the line that failed to
be split and expanded.

Related: rhbz#1689314
This commit is contained in:
Brian C. Lane 2019-03-14 12:05:29 -07:00
parent c15a976832
commit 05128a76fd
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pylorax/ltmpl.py
View File

@ -69,11 +69,17 @@ class LoraxTemplate(object):
# mako template now returns unicode strings # mako template now returns unicode strings
lines = map(lambda line: line.encode("utf8"), lines) lines = map(lambda line: line.encode("utf8"), lines)
# split with shlex and perform brace expansion # split with shlex and perform brace expansion. This can fail, so we unroll the loop
lines = map(split_and_expand, lines) # for better error reporting.
expanded_lines = []
self.lines = lines try:
return lines for line in lines:
expanded_lines.append(split_and_expand(line))
except Exception as e:
logger.error('shlex error processing "%s": %s', line, str(e))
raise
self.lines = expanded_lines
return expanded_lines
def split_and_expand(line): def split_and_expand(line):
return [exp for word in shlex.split(line) for exp in brace_expand(word)] return [exp for word in shlex.split(line) for exp in brace_expand(word)]