Skip to content

consider parent logging settings and use module name for logging #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2022
Merged

consider parent logging settings and use module name for logging #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions nginx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
INDENT = ' '
DEBUG=False

logging.basicConfig(level=logging.DEBUG if DEBUG else logging.INFO)
log = logging.getLogger(__name__)
log.setLevel(logging.DEBUG if DEBUG else logging.INFO)

class Error(Exception):
pass
Expand Down Expand Up @@ -421,31 +422,31 @@ def loads(data, conf=True):
while True:
m = re.compile(r'^\s*events\s*{').search(data[index:])
if m:
logging.debug("Open (Events)")
log.debug("Open (Events)")
e = Events()
lopen.insert(0, e)
index += m.end()
continue

m = re.compile(r'^\s*http\s*{').search(data[index:])
if m:
logging.debug("Open (Http)")
log.debug("Open (Http)")
h = Http()
lopen.insert(0, h)
index += m.end()
continue

m = re.compile(r'^\s*stream\s*{').search(data[index:])
if m:
logging.debug("Open (Stream)")
log.debug("Open (Stream)")
s = Stream()
lopen.insert(0, s)
index += m.end()
continue

m = re.compile(r'^\s*server\s*{').search(data[index:])
if m:
logging.debug("Open (Server)")
log.debug("Open (Server)")
s = Server()
lopen.insert(0, s)
index += m.end()
Expand All @@ -454,63 +455,63 @@ def loads(data, conf=True):
n = re.compile(r'(?!\B"[^"]*);(?![^"]*"\B)')
m = re.compile(r'^\s*location\s+(.*?".*?".*?|.*?)\s*{').search(data[index:])
if m and not n.search(m.group()):
logging.debug("Open (Location) {0}".format(m.group(1)))
log.debug("Open (Location) {0}".format(m.group(1)))
l = Location(m.group(1))
lopen.insert(0, l)
index += m.end()
continue

m = re.compile(r'^\s*if\s+(.*?".*?".*?|.*?)\s*{').search(data[index:])
if m and not n.search(m.group()):
logging.debug("Open (If) {0}".format(m.group(1)))
log.debug("Open (If) {0}".format(m.group(1)))
ifs = If(m.group(1))
lopen.insert(0, ifs)
index += m.end()
continue

m = re.compile(r'^\s*upstream\s+(.*?)\s*{').search(data[index:])
if m and not n.search(m.group()):
logging.debug("Open (Upstream) {0}".format(m.group(1)))
log.debug("Open (Upstream) {0}".format(m.group(1)))
u = Upstream(m.group(1))
lopen.insert(0, u)
index += m.end()
continue

m = re.compile(r'^\s*geo\s+(.*?".*?".*?|.*?)\s*{').search(data[index:])
if m and not n.search(m.group()):
logging.debug("Open (Geo) {0}".format(m.group(1)))
log.debug("Open (Geo) {0}".format(m.group(1)))
g = Geo(m.group(1))
lopen.insert(0, g)
index += m.end()
continue

m = re.compile(r'^\s*map\s+(.*?".*?".*?|.*?)\s*{').search(data[index:])
if m and not n.search(m.group()):
logging.debug("Open (Map) {0}".format(m.group(1)))
log.debug("Open (Map) {0}".format(m.group(1)))
g = Map(m.group(1))
lopen.insert(0, g)
index += m.end()
continue

m = re.compile(r'^\s*limit_except\s+(.*?".*?".*?|.*?)\s*{').search(data[index:])
if m and not n.search(m.group()):
logging.debug("Open (LimitExcept) {0}".format(m.group(1)))
log.debug("Open (LimitExcept) {0}".format(m.group(1)))
l = LimitExcept(m.group(1))
lopen.insert(0, l)
index += m.end()
continue

m = re.compile(r'^\s*types\s*{').search(data[index:])
if m:
logging.debug("Open (Types)")
log.debug("Open (Types)")
l = Types()
lopen.insert(0, l)
index += m.end()
continue

m = re.compile(r'^(\s*)#[ \r\t\f]*(.*?)\n').search(data[index:])
if m:
logging.debug("Comment ({0})".format(m.group(2)))
log.debug("Comment ({0})".format(m.group(2)))
c = Comment(m.group(2), inline='\n' not in m.group(1))
if lopen and isinstance(lopen[0], Container):
lopen[0].add(c)
Expand All @@ -522,7 +523,7 @@ def loads(data, conf=True):
m = re.compile(r'^\s*}').search(data[index:])
if m:
if isinstance(lopen[0], Container):
logging.debug("Close ({0})".format(lopen[0].__class__.__name__))
log.debug("Close ({0})".format(lopen[0].__class__.__name__))
c = lopen[0]
lopen.pop(0)
if lopen and isinstance(lopen[0], Container):
Expand All @@ -544,7 +545,7 @@ def loads(data, conf=True):
s = r'^\s*({})\s*((?:{})+);'.format(s1, s1)
m = re.compile(s).search(data[index:])
if m:
logging.debug("Key {0} {1}".format(m.group(1), m.group(2)))
log.debug("Key {0} {1}".format(m.group(1), m.group(2)))
k = Key(m.group(1), m.group(2))
if lopen and isinstance(lopen[0], (Container, Server)):
lopen[0].add(k)
Expand All @@ -555,7 +556,7 @@ def loads(data, conf=True):

m = re.compile(r'^\s*(\S+);').search(data[index:])
if m:
logging.debug("Key {0}".format(m.group(1)))
log.debug("Key {0}".format(m.group(1)))
k = Key(m.group(1), '')
if lopen and isinstance(lopen[0], (Container, Server)):
lopen[0].add(k)
Expand Down