Catch keyerrors.

util/vpc-tools/abbey.py

@@ -407,60 +407,63 @@ def poll_sqs_ansible():
 
         now = int(time.time())
         if buf:
-            if (now - max([msg['recv_ts'] for msg in buf])) > args.msg_delay:
-                # sort by TS instead of recv_ts
-                # because the sqs timestamp is not as
-                # accurate
-                buf.sort(key=lambda k: k['msg']['TS'])
-                to_disp = buf.pop(0)
-                if 'START' in to_disp['msg']:
-                    print '\n{:0>2.0f}:{:0>5.2f} {} : Starting "{}"'.format(
-                        to_disp['msg']['TS'] / 60,
-                        to_disp['msg']['TS'] % 60,
-                        to_disp['msg']['PREFIX'],
-                        to_disp['msg']['START']),
-
-                elif 'TASK' in to_disp['msg']:
-                    print "\n{:0>2.0f}:{:0>5.2f} {} : {}".format(
-                        to_disp['msg']['TS'] / 60,
-                        to_disp['msg']['TS'] % 60,
-                        to_disp['msg']['PREFIX'],
-                        to_disp['msg']['TASK']),
-                    last_task = to_disp['msg']['TASK']
-                elif 'OK' in to_disp['msg']:
-                    if args.verbose:
-                        print "\n"
-                        for key, value in to_disp['msg']['OK'].iteritems():
-                            print "    {:<15}{}".format(key, value)
-                    else:
-                        if to_disp['msg']['OK']['changed']:
-                            changed = "*OK*"
+            try:
+                if (now - max([msg['recv_ts'] for msg in buf])) > args.msg_delay:
+                    # sort by TS instead of recv_ts
+                    # because the sqs timestamp is not as
+                    # accurate
+                    buf.sort(key=lambda k: k['msg']['TS'])
+                    to_disp = buf.pop(0)
+                    if 'START' in to_disp['msg']:
+                        print '\n{:0>2.0f}:{:0>5.2f} {} : Starting "{}"'.format(
+                            to_disp['msg']['TS'] / 60,
+                            to_disp['msg']['TS'] % 60,
+                            to_disp['msg']['PREFIX'],
+                            to_disp['msg']['START']),
+    
+                    elif 'TASK' in to_disp['msg']:
+                        print "\n{:0>2.0f}:{:0>5.2f} {} : {}".format(
+                            to_disp['msg']['TS'] / 60,
+                            to_disp['msg']['TS'] % 60,
+                            to_disp['msg']['PREFIX'],
+                            to_disp['msg']['TASK']),
+                        last_task = to_disp['msg']['TASK']
+                    elif 'OK' in to_disp['msg']:
+                        if args.verbose:
+                            print "\n"
+                            for key, value in to_disp['msg']['OK'].iteritems():
+                                print "    {:<15}{}".format(key, value)
                         else:
-                            changed = "OK"
-                        print " {}".format(changed),
-                    task_report.append({
-                        'TASK': last_task,
-                        'INVOCATION': to_disp['msg']['OK']['invocation'],
-                        'DELTA': to_disp['msg']['delta'],
-                    })
-                elif 'FAILURE' in to_disp['msg']:
-                    print " !!!! FAILURE !!!!",
-                    for key, value in to_disp['msg']['FAILURE'].iteritems():
-                        print "    {:<15}{}".format(key, value)
-                    raise Exception("Failed Ansible run")
-                elif 'STATS' in to_disp['msg']:
-                    print "\n{:0>2.0f}:{:0>5.2f} {} : COMPLETE".format(
-                        to_disp['msg']['TS'] / 60,
-                        to_disp['msg']['TS'] % 60,
-                        to_disp['msg']['PREFIX'])
-
-                    # Since 3 ansible plays get run.
-                    # We see the COMPLETE message 3 times
-                    # wait till the last one to end listening
-                    # for new messages.
-                    completed += 1
-                    if completed >= NUM_PLAYBOOKS:
-                        return (to_disp['msg']['TS'], task_report)
+                            if to_disp['msg']['OK']['changed']:
+                                changed = "*OK*"
+                            else:
+                                changed = "OK"
+                            print " {}".format(changed),
+                        task_report.append({
+                            'TASK': last_task,
+                            'INVOCATION': to_disp['msg']['OK']['invocation'],
+                            'DELTA': to_disp['msg']['delta'],
+                        })
+                    elif 'FAILURE' in to_disp['msg']:
+                        print " !!!! FAILURE !!!!",
+                        for key, value in to_disp['msg']['FAILURE'].iteritems():
+                            print "    {:<15}{}".format(key, value)
+                        raise Exception("Failed Ansible run")
+                    elif 'STATS' in to_disp['msg']:
+                        print "\n{:0>2.0f}:{:0>5.2f} {} : COMPLETE".format(
+                            to_disp['msg']['TS'] / 60,
+                            to_disp['msg']['TS'] % 60,
+                            to_disp['msg']['PREFIX'])
+    
+                        # Since 3 ansible plays get run.
+                        # We see the COMPLETE message 3 times
+                        # wait till the last one to end listening
+                        # for new messages.
+                        completed += 1
+                        if completed >= NUM_PLAYBOOKS:
+                            return (to_disp['msg']['TS'], task_report)
+            except KeyError:
+                print "Failed to print status from message: {}".format(to_disp)
 
         if not messages:
             # wait 1 second between sqs polls