diff --git a/gunicorn/glogging.py b/gunicorn/glogging.py index b37e6847..08bc121a 100644 --- a/gunicorn/glogging.py +++ b/gunicorn/glogging.py @@ -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) diff --git a/tests/treq.py b/tests/treq.py index 71466855..9b6cdd1b 100644 --- a/tests/treq.py +++ b/tests/treq.py @@ -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