Merge pull request #1996 from javabrett/1690-rewritings

This commit is contained in:
Randall Leeds 2020-04-20 15:12:05 -07:00
commit 839d5dc66c
2 changed files with 2 additions and 5 deletions

View File

@ -419,10 +419,7 @@ class Logger(object):
def _set_syslog_handler(self, log, cfg, fmt, name):
# setup format
if not cfg.syslog_prefix:
prefix = cfg.proc_name.replace(":", ".")
else:
prefix = cfg.syslog_prefix
prefix = cfg.syslog_prefix or cfg.proc_name.replace(":", ".")
prefix = "gunicorn.%s.%s" % (prefix, name)

View File

@ -124,7 +124,7 @@ class request(object):
def szread(self, func, sizes):
sz = sizes()
data = func(sz)
if sz >= 0 and len(data) > sz:
if 0 <= sz < len(data):
raise AssertionError("Read more than %d bytes: %s" % (sz, data))
return data