From: Vinay Sajip Date: Thu, 15 Jul 2010 21:40:13 +0000 (+0000) Subject: Backported SysLogHandler fix for issue #7077. X-Git-Tag: v3.1.3rc1~501 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e030d937c61006df02caaae8ad1e540b15c88a58;p=python Backported SysLogHandler fix for issue #7077. --- diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 31352ad1c7..82c418b368 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -202,7 +202,11 @@ class TimedRotatingFileHandler(BaseRotatingHandler): self.extMatch = re.compile(self.extMatch, re.ASCII) 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): """ @@ -774,6 +778,9 @@ class SysLogHandler(logging.Handler): self.encodePriority(self.facility, self.mapPriority(record.levelname)), msg) + msg = msg.encode('utf-8') + if codecs: + msg = codecs.BOM_UTF8 + msg try: if self.unixsocket: try: