From 02d9fd9ad4816f357c614a230b34d7e3fcdcdcf9 Mon Sep 17 00:00:00 2001 From: mathieui Date: Mon, 31 Mar 2014 22:56:29 +0200 Subject: Fix #2462 (wrong timezone in the logs) Now everything in the logs is in UTC time, and is converted when read (also, actually return the logs after loading them instead of not doing anything) --- src/logger.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/logger.py') diff --git a/src/logger.py b/src/logger.py index c05cc4a6..2c878606 100644 --- a/src/logger.py +++ b/src/logger.py @@ -5,11 +5,13 @@ # Poezio is free software: you can redistribute it and/or modify # it under the terms of the zlib license. See the COPYING file. -from os import environ, makedirs import mmap import os import re +from os import environ, makedirs from datetime import datetime + +import common from config import config from xhtml import clean_text from theming import dump_tuple, get_theme @@ -155,7 +157,9 @@ class Logger(object): log.debug('format? %s', tup) continue time = [int(i) for index, i in enumerate(tup) if index < 6] - message = {'lines': [], 'history': True, 'time': datetime(*time)} + message = {'lines': [], + 'history': True, + 'time': common.get_local_time(datetime(*time))} size = int(tup[6]) if len(tup) == 8: #info line message['lines'].append(color+tup[7]) @@ -195,9 +199,9 @@ class Logger(object): try: msg = clean_text(msg) if date is None: - str_time = datetime.now().strftime('%Y%m%dT%H:%M:%SZ') + str_time = common.get_utc_time().strftime('%Y%m%dT%H:%M:%SZ') else: - str_time = date.strftime('%Y%m%dT%H:%M:%SZ') + str_time = common.get_utc_time(date).strftime('%Y%m%dT%H:%M:%SZ') if typ == 1: prefix = 'MR' else: @@ -244,7 +248,7 @@ class Logger(object): exc_info=True) return False try: - str_time = datetime.now().strftime('%Y%m%dT%H:%M:%SZ') + str_time = common.get_utc_time().strftime('%Y%m%dT%H:%M:%SZ') message = clean_text(message) lines = message.split('\n') first_line = lines.pop(0) -- cgit v1.2.3