rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/arsana7/qutebrowser into arsana7-master

Browse Source
This commit is contained in:
Florian Bruhin 2016-02-17 07:03:17 +01:00
commit 116ab5429a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/misc/crashdialog.py
View File

@ -26,6 +26,7 @@ import html
import getpass import getpass
import fnmatch import fnmatch
import traceback import traceback
import datetime
import pkg_resources import pkg_resources
from PyQt5.QtCore import pyqtSlot, Qt, QSize, qVersion from PyQt5.QtCore import pyqtSlot, Qt, QSize, qVersion
@ -239,6 +240,10 @@ class _CrashDialog(QDialog):
self._crash_info.append(('Launch time', launch_time)) self._crash_info.append(('Launch time', launch_time))
except Exception: except Exception:
self._crash_info.append(("Launch time", traceback.format_exc())) 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: try:
self._crash_info.append(("Version info", version.version())) self._crash_info.append(("Version info", version.version()))
except Exception: except Exception:

4
qutebrowser/utils/log.py
View File

@ -51,10 +51,10 @@ else:
colorama.deinit() colorama.deinit()
# Log formats to use. # Log formats to use.
SIMPLE_FMT = '{levelname}: {message}' SIMPLE_FMT = '{asctime:8} {levelname}: {message}'
EXTENDED_FMT = ('{asctime:8} {levelname:8} {name:10} {module}:{funcName}:' EXTENDED_FMT = ('{asctime:8} {levelname:8} {name:10} {module}:{funcName}:'
'{lineno} {message}') '{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 = ( EXTENDED_FMT_COLORED = (
'%(green)s%(asctime)-8s%(reset)s ' '%(green)s%(asctime)-8s%(reset)s '
'%(log_color)s%(levelname)-8s%(reset)s ' '%(log_color)s%(levelname)-8s%(reset)s '