github
/
gixy
mirror of https://github.com/yandex/gixy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Nginx parser now returns original root if can't parse a config

pull/16/head
Andrew Krasichkov 2017-04-28 18:58:01 +03:00
parent 957f3c4554
commit c63435a760
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gixy/parser/nginx_parser.py
View File

@ -28,8 +28,14 @@ class NginxParser(object):
if not root: if not root:
root = block.Root() root = block.Root()
parser = raw_parser.RawParser()
parsed = parser.parse(file_path) try:
parser = raw_parser.RawParser()
parsed = parser.parse(file_path)
except ParseException as e:
LOG.error('Failed to parse config "{file}": {error}'.format(file=file_path, error=str(e)))
return root
if len(parsed) and parsed[0].getName() == 'file_delimiter': if len(parsed) and parsed[0].getName() == 'file_delimiter':
# Were parse nginx dump # Were parse nginx dump
LOG.info('Switched to parse nginx configuration dump.') LOG.info('Switched to parse nginx configuration dump.')
@ -104,10 +110,7 @@ class NginxParser(object):
for file_path in glob.iglob(path): for file_path in glob.iglob(path):
include = block.IncludeBlock('include', [file_path]) include = block.IncludeBlock('include', [file_path])
parent.append(include) parent.append(include)
try: self.parse(file_path, include)
self.parse(file_path, include)
except ParseException as e:
LOG.error('Failed to parse include "{file}": {error}'.format(file=file_path, error=str(e)))
if not file_path: if not file_path:
LOG.warning("File not found: {}".format(path)) LOG.warning("File not found: {}".format(path))
@ -120,10 +123,7 @@ class NginxParser(object):
founded = True founded = True
include = block.IncludeBlock('include', [file_path]) include = block.IncludeBlock('include', [file_path])
parent.append(include) parent.append(include)
try: self.parse_block(parsed, include)
self.parse_block(parsed, include)
except ParseException as e:
LOG.error('Failed to parse include "{file}": {error}'.format(file=file_path, error=str(e)))
if not founded: if not founded:
LOG.warning("File not found: {}".format(path)) LOG.warning("File not found: {}".format(path))