X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdak.py;h=f9839ea0052d9f4d4fab1b0a846555b40734a5db;hb=c7cd84ed41a5b670db475483b5ed3016931c223d;hp=052f3b3ef7b8b7e48717116809771f20d80d75d6;hpb=731c2232d9964d0f441ff5ea386e5e9937aa77ab;p=dak.git

diff --git a/dak/dak.py b/dak/dak.py
index 052f3b3e..f9839ea0 100755
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -34,8 +34,13 @@ G{importgraph}
 ################################################################################
 
 import sys
+import traceback
 import daklib.utils
 
+from daklib.daklog import Logger
+from daklib.config import Config
+from daklib.dak_exceptions import CantOpenError
+
 ################################################################################
 
 def init():
@@ -152,6 +157,12 @@ Available commands:"""
 def main():
     """Launch dak functionality."""
 
+
+    try:
+        logger = Logger(Config(), 'dak top-level', print_starting=False)
+    except CantOpenError:
+        logger = None
+
     functionality = init()
     modules = [ command for (command, _) in functionality ]
 
@@ -189,7 +200,21 @@ def main():
     # Invoke the module
     module = __import__(cmdname.replace("-","_"))
 
-    module.main()
+    try:
+        module.main()
+    except KeyboardInterrupt:
+        msg = 'KeyboardInterrupt caught; exiting'
+        print msg
+        if logger:
+            logger.log([msg])
+        sys.exit(1)
+    except SystemExit:
+        pass
+    except:
+        if logger:
+            for line in traceback.format_exc().split('\n')[:-1]:
+                logger.log(['exception', line])
+        raise
 
 ################################################################################