X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdak.py;h=19facc5592ef853fe36769720f7c8749d9d48d24;hb=0bba8752f2d5aae54f10cf815398b57b046f35e8;hp=052f3b3ef7b8b7e48717116809771f20d80d75d6;hpb=1e5659500391bce37a28870ef7bce5c59eba68c7;p=dak.git

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