Kaydet (Commit) e030d937 authored tarafından Vinay Sajip's avatar Vinay Sajip

Backported SysLogHandler fix for issue #7077.

üst 09cfa890
...@@ -202,7 +202,11 @@ class TimedRotatingFileHandler(BaseRotatingHandler): ...@@ -202,7 +202,11 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
self.extMatch = re.compile(self.extMatch, re.ASCII) self.extMatch = re.compile(self.extMatch, re.ASCII)
self.interval = self.interval * interval # multiply by units requested self.interval = self.interval * interval # multiply by units requested
self.rolloverAt = self.computeRollover(int(time.time())) if os.path.exists(filename):
t = os.stat(filename)[ST_MTIME]
else:
t = int(time.time())
self.rolloverAt = self.computeRollover(t)
def computeRollover(self, currentTime): def computeRollover(self, currentTime):
""" """
...@@ -774,6 +778,9 @@ class SysLogHandler(logging.Handler): ...@@ -774,6 +778,9 @@ class SysLogHandler(logging.Handler):
self.encodePriority(self.facility, self.encodePriority(self.facility,
self.mapPriority(record.levelname)), self.mapPriority(record.levelname)),
msg) msg)
msg = msg.encode('utf-8')
if codecs:
msg = codecs.BOM_UTF8 + msg
try: try:
if self.unixsocket: if self.unixsocket:
try: try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment