ZeroDownTime/CloudBender
3
0
Fork 0
Code Issues 1 Pull Requests 4 Packages Projects Releases Wiki Activity

Also remove empty lines when removing comments from includes, fix debug logging

Browse Source
This commit is contained in:
Stefan Reimer 2020-07-08 01:29:52 +01:00
parent a92b56083b
commit eea8bc6254
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cloudbender/jinja.py
View File

@ -56,10 +56,13 @@ def include_raw_gz(context, files=None, gz=True, remove_comments=False):
if remove_comments: if remove_comments:
# Remove full line comments but not shebang # Remove full line comments but not shebang
_re = re.compile(r'^\s*#[^!]') _re_comment = re.compile(r'^\s*#[^!]')
_re_blank = re.compile(r'^\s*$')
stripped_output = '' stripped_output = ''
for curline in output.splitlines(): for curline in output.splitlines():
if re.match(_re, curline): if re.match(_re_blank, curline):
continue
elif re.match(_re_comment, curline):
logger.debug("Removed {}".format(curline)) logger.debug("Removed {}".format(curline))
else: else:
stripped_output = stripped_output + curline + '\n' stripped_output = stripped_output + curline + '\n'

1
cloudbender/utils.py
View File

@ -37,7 +37,6 @@ def setup_logging(debug):
if debug: if debug:
our_level = logging.DEBUG our_level = logging.DEBUG
logging.getLogger("botocore").setLevel(logging.INFO) logging.getLogger("botocore").setLevel(logging.INFO)
boto3.set_stream_logger('')
formatter = logging.Formatter( formatter = logging.Formatter(
fmt="[%(asctime)s] %(name)s %(message)s", fmt="[%(asctime)s] %(name)s %(message)s",