cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added filtering of non-JSON lines.

Browse source
This commit is contained in:
Dietmar Schinnerl 2012-08-11 16:24:16 +02:00
parent fbdddc7c74
commit 6b622beb4d
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/utils.py
View file

@ -120,7 +120,7 @@ def json_loads(data):
def parse_json(raw_data): def parse_json(raw_data):
''' this version for module return data only ''' ''' this version for module return data only '''
data = filter_leading_garbage(raw_data) data = filter_leading_non_json_lines(raw_data)
try: try:
return json.loads(data) return json.loads(data)
@ -420,11 +420,20 @@ def last_non_blank_line(lines):
return "" # we shouldn't come here (no lines?) but let's pretend nothing happend return "" # we shouldn't come here (no lines?) but let's pretend nothing happend
# We can't return all lines here because calling code expects only one # We can't return all lines here because calling code expects only one
# line. And since we don't know which line to return we return an empty
# line. # line.
def line_needs_filtering(line): def is_valid_json_line(line):
return line.startswith('#') or (len(line) == 0) return line.startswith('=') or line.startswith('{') or line.startswith('[')
def filter_leading_garbage(lines): def filter_leading_non_json_lines(lines):
return lines ''' we need to filter anything which starts not with '{', '[', ', '=' or is an empty line.
But we filter only leading lines since multiline JSON is valid. '''
filtered_lines = ''
no_more_filtering = False
for line in lines.splitlines():
if (no_more_filtering or is_valid_json_line(line)):
no_more_filtering = True
filtered_lines += line + '\n'
return filtered_lines