Merge branch 'master' of https://github.com/arsana7/qutebrowser into arsana7-master
This commit is contained in:
commit
116ab5429a
@ -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:
|
||||
|
@ -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 '
|
||||
|
Loading…
Reference in New Issue
Block a user