jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix debug mode in gaiohttp worker

Browse Source 
The debug setting has been removed and now only the debug level can be used to know if
we are in debug mode or not. This change update the gaiohttp worker to handle
that. While I'm here, expose the loglevel from the Logger class.

fix #977
This commit is contained in:
benoitc 2015-02-04 10:07:18 +01:00
parent d8eca3ebf1
commit 8b6d86ef2b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gunicorn/glogging.py
View File

@ -171,12 +171,13 @@ class Logger(object):
self.access_log.propagate = False self.access_log.propagate = False
self.error_handlers = [] self.error_handlers = []
self.access_handlers = [] self.access_handlers = []
self.loglevel = logging.INFO
self.cfg = cfg self.cfg = cfg
self.setup(cfg) self.setup(cfg)
def setup(self, cfg): def setup(self, cfg):
loglevel = self.LOG_LEVELS.get(cfg.loglevel.lower(), logging.INFO) self.loglevel = self.LOG_LEVELS.get(cfg.loglevel.lower(), logging.INFO)
self.error_log.setLevel(loglevel) self.error_log.setLevel(self.loglevel)
self.access_log.setLevel(logging.INFO) self.access_log.setLevel(logging.INFO)
# set gunicorn.error handler # set gunicorn.error handler

6
gunicorn/workers/_gaiohttp.py
View File

@ -5,6 +5,7 @@
import asyncio import asyncio
import functools import functools
import logging
import os import os
import gunicorn.workers.base as base import gunicorn.workers.base as base
@ -44,11 +45,14 @@ class AiohttpWorker(base.Worker):
return proto return proto
def factory(self, wsgi, addr): def factory(self, wsgi, addr):
# are we in debug level
is_debug = self.log.loglevel == logging.DEBUG
proto = WSGIServerHttpProtocol( proto = WSGIServerHttpProtocol(
wsgi, readpayload=True, wsgi, readpayload=True,
loop=self.loop, loop=self.loop,
log=self.log, log=self.log,
debug=self.cfg.debug, debug=is_debug,
keep_alive=self.cfg.keepalive, keep_alive=self.cfg.keepalive,
access_log=self.log.access_log, access_log=self.log.access_log,
access_log_format=self.cfg.access_log_format) access_log_format=self.cfg.access_log_format)