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

don't try to redirect stdout/stderr to the logfile.

Browse Source 
Logging to a logfile should be explicit and gunicorn should not try to
be smarter here. Partially fix #591
This commit is contained in:
benoitc 2013-12-27 12:07:46 +01:00
parent 141aa9d4cf
commit 41523188bc
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gunicorn/glogging.py
View File

@ -11,7 +11,6 @@ import os
import socket import socket
import sys import sys
import traceback import traceback
import threading
from gunicorn import util from gunicorn import util
from gunicorn.six import string_types from gunicorn.six import string_types
@ -164,8 +163,6 @@ class Logger(object):
self.error_handlers = [] self.error_handlers = []
self.access_handlers = [] self.access_handlers = []
self.cfg = cfg self.cfg = cfg
self.logfile = None
self.lock = threading.Lock()
self.setup(cfg) self.setup(cfg)
def setup(self, cfg): def setup(self, cfg):
@ -173,16 +170,6 @@ class Logger(object):
self.error_log.setLevel(loglevel) self.error_log.setLevel(loglevel)
self.access_log.setLevel(logging.INFO) self.access_log.setLevel(logging.INFO)
if cfg.errorlog != "-":
# if an error log file is set redirect stdout & stderr to
# this log file.
for stream in sys.stdout, sys.stderr:
stream.flush()
self.logfile = open(cfg.errorlog, 'a+')
os.dup2(self.logfile.fileno(), sys.stdout.fileno())
os.dup2(self.logfile.fileno(), sys.stderr.fileno())
# set gunicorn.error handler # set gunicorn.error handler
self._set_handler(self.error_log, cfg.errorlog, self._set_handler(self.error_log, cfg.errorlog,
logging.Formatter(self.error_fmt, self.datefmt)) logging.Formatter(self.error_fmt, self.datefmt))
@ -287,20 +274,6 @@ class Logger(object):
now.year, now.hour, now.minute, now.second) now.year, now.hour, now.minute, now.second)
def reopen_files(self): def reopen_files(self):
if self.cfg.errorlog != "-":
# if an error log file is set redirect stdout & stderr to
# this log file.
for stream in sys.stdout, sys.stderr:
stream.flush()
with self.lock:
if self.logfile is not None:
self.logfile.close()
self.logfile = open(self.cfg.errorlog, 'a+')
os.dup2(self.logfile.fileno(), sys.stdout.fileno())
os.dup2(self.logfile.fileno(), sys.stderr.fileno())
for log in loggers(): for log in loggers():
for handler in log.handlers: for handler in log.handlers:
if isinstance(handler, logging.FileHandler): if isinstance(handler, logging.FileHandler):