From 927beef1350c93083f28b884d5f393eca396d1b5 Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 9 May 2017 03:01:08 +0200 Subject: Global error handling --- butler.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'butler.py') diff --git a/butler.py b/butler.py index 00644f5..362213d 100644 --- a/butler.py +++ b/butler.py @@ -1,26 +1,28 @@ import sys -from ausbutler.config import load_config -from ausbutler.goniec import Goniec -from ausbutler.interface import Interface - - def main(): nowait = 'nowait' not in sys.argv args = [arg for arg in sys.argv[1:] if arg != 'nowait'] if len(args) == 0: args = ['calculate', 'generate', 'send'] - i = Interface(load_config('butler')) + try: + from ausbutler.config import load_config + from ausbutler.goniec import Goniec + from ausbutler.interface import Interface + + i = Interface(load_config('butler')) - if 'calculate' in args: - i.calculate_all() + if 'calculate' in args: + i.calculate_all() - if 'generate' in args: - files = i.generate_all() - if 'send' in args: - client = Goniec(load_config('goniec')) - client.send(files) + if 'generate' in args: + files = i.generate_all() + if 'send' in args: + client = Goniec(load_config('goniec')) + client.send(files) + except Exception as e: + print str(e) if nowait: raw_input('Press any key to continue...') -- cgit v1.2.3