More log level fixes

[fdroidserver.git] / fdroid

diff --git a/fdroid b/fdroid
index a2035fa2318d99f1ab5c468eec124b5f688482d3..c59578cf3b62f1e3da85810e941e8bd8701e08e3 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -21,6 +21,8 @@
 import sys
 import logging
 
+from fdroidserver.common import FDroidException
+
 commands = {
     "build": "Build a package from source",
     "init": "Quickly start a new repository",
@@ -67,30 +69,41 @@ def main():
 
     verbose = any(s in sys.argv for s in ['-v', '--verbose'])
     quiet = any(s in sys.argv for s in ['-q', '--quiet'])
-    if verbose and quiet:
-        print "Specifying verbose and quiet and the same time is silly"
-        sys.exit(1)
 
     if verbose:
         logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
     elif quiet:
-        logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.WARN)
+        logging.basicConfig(format='%(message)s', level=logging.WARN)
     else:
         logging.basicConfig(format='%(message)s', level=logging.INFO)
 
+    if verbose and quiet:
+        logging.critical("Specifying --verbose and --quiet and the same time is silly")
+        sys.exit(1)
+
     # Trick optparse into displaying the right usage when --help is used.
     sys.argv[0] += ' ' + command
 
     del sys.argv[1]
     mod = __import__('fdroidserver.' + command, None, None, [command])
+
     try:
         mod.main()
-    except Exception, e:
+    # These are ours, contain a proper message and are "expected"
+    except FDroidException, e:
         if verbose:
             raise
         else:
-            print str(e)
+            logging.critical(str(e))
         sys.exit(1)
+    except KeyboardInterrupt:
+        print('')
+        sys.exit(1)
+    # These should only be unexpected crashes due to bugs in the code
+    # str(e) often doesn't contain a reason, so just show the backtrace
+    except Exception, e:
+        logging.critical("Unknown exception found!")
+        raise
     sys.exit(0)
 
 if __name__ == "__main__":