Merge branch 'arsana7-master'

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

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
@@ -236,7 +237,9 @@ 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:

qutebrowser/utils/log.py

@@ -51,10 +51,11 @@ 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 '