misc: Make git ignore .pyc files.

[matthijs/projects/backupninja.git] / src / backupninja

diff --git a/src/backupninja b/src/backupninja
index b3c26f4343f5e80daf437e41ff0157329dfe5e69..48330b3a6a28943e8167b4447aa844ff36141649 100755 (executable)
--- a/src/backupninja
+++ b/src/backupninja
@@ -23,8 +23,14 @@
 """ Check for scheduled backupninja actions and run them when needed """
 
 import optparse
+import logging
 import sys
 
+from backupninja.log import setup_logging
+from backupninja import config
+
+log = logging.getLogger()
+
 def make_option_parser():
     description = """%prog checks for scheduled actions and runs them when needed."""
     parser = optparse.OptionParser(description=description)
@@ -37,9 +43,19 @@ def main(argv):
     parser = make_option_parser()
     (options, args) = parser.parse_args(argv)
 
+    # Setup logging
+    setup_logging(options)
+
     # Load config file
+    global_conf = config.get_global_config(options)
+    if global_conf is None:
+        # Error was already logged
+        return 1
+
     # Process command
     parser.print_help()
 
+    return 0
+
 if __name__ == '__main__':
     sys.exit(main(sys.argv))