From 53719366e0c725e80e859108b29f385ca46a45c0 Mon Sep 17 00:00:00 2001 From: avk Date: Fri, 12 Feb 2016 11:02:08 +0100 Subject: [PATCH 1/5] Added time to standard log --- qutebrowser/utils/log.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index 9023085cf..bacefa2b8 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -51,10 +51,10 @@ else: colorama.deinit() # Log formats to use. -SIMPLE_FMT = '{levelname}: {message}' +SIMPLE_FMT = '{asctime:8} {levelname}: {message}' EXTENDED_FMT = ('{asctime:8} {levelname:8} {name:10} {module}:{funcName}:' '{lineno} {message}') -SIMPLE_FMT_COLORED = '%(log_color)s%(levelname)s%(reset)s: %(message)s' +SIMPLE_FMT_COLORED = '%(green)s%(asctime)-8s%(reset)s %(log_color)s%(levelname)s%(reset)s: %(message)s' EXTENDED_FMT_COLORED = ( '%(green)s%(asctime)-8s%(reset)s ' '%(log_color)s%(levelname)-8s%(reset)s ' From d551591b42794414a6f1e99e615ebdbf6b86eba1 Mon Sep 17 00:00:00 2001 From: avk Date: Fri, 12 Feb 2016 11:59:45 +0100 Subject: [PATCH 2/5] Added crash time to crash report --- qutebrowser/misc/crashdialog.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py index 4a2244af4..6dc0c5642 100644 --- a/qutebrowser/misc/crashdialog.py +++ b/qutebrowser/misc/crashdialog.py @@ -26,6 +26,7 @@ import html import getpass import fnmatch import traceback +import datetime import pkg_resources from PyQt5.QtCore import pyqtSlot, Qt, QSize, qVersion @@ -239,6 +240,10 @@ class _CrashDialog(QDialog): self._crash_info.append(('Launch time', launch_time)) except Exception: self._crash_info.append(("Launch time", traceback.format_exc())) + try: + self._crash_info.append(("Crash time", datetime.datetime.now().ctime())) + except Exception: + self._crash_info.append(("Crash time", traceback.format_exc())) try: self._crash_info.append(("Version info", version.version())) except Exception: From 36019c0cab661021e1c6c60807256dfc40541854 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 17 Feb 2016 07:04:25 +0100 Subject: [PATCH 3/5] Split long lines. --- qutebrowser/misc/crashdialog.py | 3 ++- qutebrowser/utils/log.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py index 6dc0c5642..0e794b308 100644 --- a/qutebrowser/misc/crashdialog.py +++ b/qutebrowser/misc/crashdialog.py @@ -241,7 +241,8 @@ class _CrashDialog(QDialog): except Exception: self._crash_info.append(("Launch time", traceback.format_exc())) try: - self._crash_info.append(("Crash time", datetime.datetime.now().ctime())) + self._crash_info.append(("Crash time", + datetime.datetime.now().ctime())) except Exception: self._crash_info.append(("Crash time", traceback.format_exc())) try: diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index bacefa2b8..5047a2f61 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -54,7 +54,8 @@ else: SIMPLE_FMT = '{asctime:8} {levelname}: {message}' EXTENDED_FMT = ('{asctime:8} {levelname:8} {name:10} {module}:{funcName}:' '{lineno} {message}') -SIMPLE_FMT_COLORED = '%(green)s%(asctime)-8s%(reset)s %(log_color)s%(levelname)s%(reset)s: %(message)s' +SIMPLE_FMT_COLORED = ('%(green)s%(asctime)-8s%(reset)s ' + '%(log_color)s%(levelname)s%(reset)s: %(message)s') EXTENDED_FMT_COLORED = ( '%(green)s%(asctime)-8s%(reset)s ' '%(log_color)s%(levelname)-8s%(reset)s ' From 2b2331754df40dd8d730ee72897bbfa61d5544c5 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 17 Feb 2016 07:10:01 +0100 Subject: [PATCH 4/5] Combine launch/crash time into one section. --- qutebrowser/misc/crashdialog.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py index 0e794b308..213c38187 100644 --- a/qutebrowser/misc/crashdialog.py +++ b/qutebrowser/misc/crashdialog.py @@ -237,14 +237,11 @@ class _CrashDialog(QDialog): try: application = QApplication.instance() launch_time = application.launch_time.ctime() - self._crash_info.append(('Launch time', launch_time)) + crash_time = datetime.datetime.now().ctime() + text = 'Launch: {}\nCrash: {}'.format(launch_time, crash_time) + self._crash_info.append(('Timestamps', text)) except Exception: self._crash_info.append(("Launch time", traceback.format_exc())) - try: - self._crash_info.append(("Crash time", - datetime.datetime.now().ctime())) - except Exception: - self._crash_info.append(("Crash time", traceback.format_exc())) try: self._crash_info.append(("Version info", version.version())) except Exception: From 7ba6752020aa2341e515172ec0df97c9ef42115e Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 17 Feb 2016 07:10:14 +0100 Subject: [PATCH 5/5] Regenerate authors. --- README.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.asciidoc b/README.asciidoc index a4632f27e..de1fefdaa 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -184,6 +184,7 @@ Contributors, sorted by the number of commits in descending order: * Link * Larry Hynes * Johannes Altmanninger +* avk * Samir Benmendil * Regina Hug * Mathias Fussenegger