Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean tz from log if in CET time

Browse source
This commit is contained in:
Griatch 2018-01-19 09:50:26 +01:00
parent fbbf920587
commit 4769599cf9
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
evennia/utils/logger.py
View file

@ -38,7 +38,7 @@ def timeformat(when=None):
This helper function will format the current time in the same This helper function will format the current time in the same
way as the twisted logger does, including time zone info. Only way as the twisted logger does, including time zone info. Only
difference from official logger is that we only use two digits difference from official logger is that we only use two digits
for the year. for the year and don't show timezone for CET times.
Args: Args:
when (int, optional): This is a time in POSIX seconds on the form when (int, optional): This is a time in POSIX seconds on the form
@ -55,14 +55,19 @@ def timeformat(when=None):
tz_offset = tz_offset.days * 86400 + tz_offset.seconds tz_offset = tz_offset.days * 86400 + tz_offset.seconds
# correct given time to utc # correct given time to utc
when = datetime.utcfromtimestamp(when - tz_offset) when = datetime.utcfromtimestamp(when - tz_offset)
tz_hour = abs(int(tz_offset // 3600))
tz_mins = abs(int(tz_offset // 60 % 60))
tz_sign = "-" if tz_offset >= 0 else "+"
return '%d-%02d-%02d %02d:%02d:%02d%s%02d%02d' % ( if tz_offset == 0:
tz = ""
else:
tz_hour = abs(int(tz_offset // 3600))
tz_mins = abs(int(tz_offset // 60 % 60))
tz_sign = "-" if tz_offset >= 0 else "+"
tz = "%s%02d%s" % (tz_sign, tz_hour,
(":%02d" % tz_mins if tz_mins else ""))
return '%d-%02d-%02d %02d:%02d:%02d%s' % (
when.year - 2000, when.month, when.day, when.year - 2000, when.month, when.day,
when.hour, when.minute, when.second, when.hour, when.minute, when.second, tz)
tz_sign, tz_hour, tz_mins)
class WeeklyLogFile(logfile.DailyLogFile): class WeeklyLogFile(logfile.DailyLogFile):