From 2690891cbeae0596a9e94230e146fe6eb52698cb Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 23 Jun 2014 06:37:47 +0200
Subject: [PATCH] Better init logging

---
 qutebrowser/app.py                    | 19 +++++++++++++++++++
 qutebrowser/keyinput/basekeyparser.py |  3 ---
 qutebrowser/qutebrowser.py            |  2 ++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 341566d30..8250393fd 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -123,33 +123,52 @@ class Application(QApplication):
         sys.excepthook = self._exception_hook
 
         self.args = args
+        log.init.debug("Starting init...")
         self._init_misc()
         actute_warning()
+        log.init.debug("Initializing config...")
         self._init_config()
+        log.init.debug("Initializing crashlog...")
         self._handle_segfault()
+        log.init.debug("Initializing modes...")
         self._init_modes()
+        log.init.debug("Initializing websettings...")
         websettings.init()
+        log.init.debug("Initializing quickmarks...")
         quickmarks.init()
+        log.init.debug("Initializing proxy...")
         proxy.init()
+        log.init.debug("Initializing cookies...")
         self.cookiejar = CookieJar(self)
+        log.init.debug("Initializing NetworkManager...")
         self.networkmanager = NetworkManager(self.cookiejar)
+        log.init.debug("Initializing commands...")
         self.commandmanager = CommandManager()
+        log.init.debug("Initializing search...")
         self.searchmanager = SearchManager(self)
+        log.init.debug("Initializing downloads...")
         self.downloadmanager = DownloadManager(self)
+        log.init.debug("Initializing main window...")
         self.mainwindow = MainWindow()
 
         self.modeman.mainwindow = self.mainwindow
+        log.init.debug("Initializing eventfilter...")
         self.installEventFilter(self.modeman)
         self.setQuitOnLastWindowClosed(False)
 
+        log.init.debug("Connecting signals...")
         self._connect_signals()
         self.modeman.enter('normal', 'init')
 
+        log.init.debug("Showing mainwindow...")
         self.mainwindow.show()
+        log.init.debug("Applying python hacks...")
         self._python_hacks()
         timer = QTimer.singleShot(0, self._process_init_args)
         self._timers.append(timer)
 
+        log.init.debug("Init done!")
+
         if self._crashdlg is not None:
             self._crashdlg.raise_()
 
diff --git a/qutebrowser/keyinput/basekeyparser.py b/qutebrowser/keyinput/basekeyparser.py
index e3bc2be92..4bce99724 100644
--- a/qutebrowser/keyinput/basekeyparser.py
+++ b/qutebrowser/keyinput/basekeyparser.py
@@ -344,11 +344,8 @@ class BaseKeyParser(QObject):
                 continue
             elif key.startswith('<') and key.endswith('>'):
                 keystr = self._normalize_keystr(key[1:-1])
-                logger.debug("registered special key: {} -> {}".format(keystr,
-                                                                       cmd))
                 self.special_bindings[keystr] = cmd
             elif self._supports_chains:
-                logger.debug("registered key: {} -> {}".format(key, cmd))
                 self.bindings[key] = cmd
             elif self.warn_on_keychains:
                 logger.warning(
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index d194a344c..3ecdddb37 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -87,6 +87,8 @@ def main():
     # Note we may not import webkit stuff yet as fix_harfbuzz didn't run.
     import qutebrowser.utils.log as log
     log.init_log(args)
+    log.init.debug("Log initialized.")
+    log.init.debug("Doing early init.")
     earlyinit.fix_harfbuzz(args)
     earlyinit.check_qt_version()
     earlyinit.check_pyqt_webkit()