From 4cad4e3cc23d4c29313986ced69561ff21efe37b Mon Sep 17 00:00:00 2001 From: Marius Halden Date: Sun, 12 Apr 2015 16:41:34 +0200 Subject: Changed some error handling --- push.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/push.py b/push.py index 4580f50..b5ad459 100755 --- a/push.py +++ b/push.py @@ -18,8 +18,17 @@ except IndexError: with open(cfg, 'r') as fh: maps = yaml.load(fh) -sender_map = maps.get('senders', []) -recipient_map = maps.get('recipients', []) +try: + sender_map = maps['senders'] +except KeyError: + print >>sys.stderr, "Found no senders." + sys.exit(1) + +try: + recipient_map = maps['recipients'] +except KeyError: + print >>sys.stderr, "Found no recipients." + sys.exit(1) try: recipient = os.environ['RECIPIENT'] @@ -33,9 +42,6 @@ except KeyError: print >>sys.stderr, "Sender missing." sys.exit(1) -api_token = None -user_tokens = None - # Select api key from map based on sender for s in sender_map: try: -- cgit v1.2.3