projects
/
matthijs
/
projects
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: Log at INFO instead of ERROR.
[matthijs/projects/backupninja.git]
/
src
/
backupninja
diff --git
a/src/backupninja
b/src/backupninja
index b3c26f4343f5e80daf437e41ff0157329dfe5e69..e351c62acd9afd171be82135dc554d74e2b8145e 100755
(executable)
--- a/
src/backupninja
+++ b/
src/backupninja
@@
-23,8
+23,15
@@
""" Check for scheduled backupninja actions and run them when needed """
import optparse
""" Check for scheduled backupninja actions and run them when needed """
import optparse
+import logging
import sys
import sys
+from backupninja.log import setup_logging
+from backupninja import config
+from backupninja import action
+
+log = logging.getLogger()
+
def make_option_parser():
description = """%prog checks for scheduled actions and runs them when needed."""
parser = optparse.OptionParser(description=description)
def make_option_parser():
description = """%prog checks for scheduled actions and runs them when needed."""
parser = optparse.OptionParser(description=description)
@@
-37,9
+44,19
@@
def main(argv):
parser = make_option_parser()
(options, args) = parser.parse_args(argv)
parser = make_option_parser()
(options, args) = parser.parse_args(argv)
+ # Setup logging
+ setup_logging(options)
+
# Load config file
# Load config file
+ global_conf = config.get_global_config(options)
+ if global_conf is None:
+ # Error was already logged
+ return 1
+
# Process command
# Process command
- parser.print_help()
+ action.run_all_actions(options, global_conf)
+
+ return 0
if __name__ == '__main__':
sys.exit(main(sys.argv))
if __name__ == '__main__':
sys.exit(main(sys.argv))