Merge lp:~brian-murray/ubuntu-archive-tools/pu-json-decode-error into lp:ubuntu-archive-tools

[Brian Murray]

Fixes this Traceback:

Traceback (most recent call last):
  File "/home/ubuntu-archive/ubuntu-archive-tools/phased-updater", line 664, in <module>
    main()
  File "/home/ubuntu-archive/ubuntu-archive-tools/phased-updater", line 569, in main
    rate_increase = crash_rate_increase(release, src_pkg, version, max_pup)
  File "/home/ubuntu-archive/ubuntu-archive-tools/phased-updater", line 465, in crash_rate_increase
    rate_data = json.load(rate_file)
  File "/usr/lib/python2.7/dist-packages/simplejson/__init__.py", line 357, in load
    use_decimal=use_decimal, **kw)
  File "/usr/lib/python2.7/dist-packages/simplejson/__init__.py", line 413, in loads
    return _default_decoder.decode(s)
  File "/usr/lib/python2.7/dist-packages/simplejson/decoder.py", line 405, in decode
    raise JSONDecodeError("Extra data", s, end, len(s))
simplejson.decoder.JSONDecodeError: Extra data: line 2 column 1 - line 32 column 1 (char 3 - 621)

=== modified file 'phased-updater'
--- phased-updater	2015-06-23 16:15:41 +0000
+++ phased-updater	2015-06-26 16:40:40 +0000
@@ -385,7 +385,11 @@
     if new_buckets_file.getcode() != 200:
         logging.error('HTTP error retrieving %s' % new_buckets_url)
         return 'error'
-    new_buckets_data = json.load(new_buckets_file)
+    try:
+        new_buckets_data = json.load(new_buckets_file)
+    except json.decoder.JSONDecodeError:
+        logging.error('Error getting new buckets at %s' % new_buckets_url)
+        return 'error'
     if 'error_message' in new_buckets_data.keys():
         logging.error('Error getting new buckets at %s' % new_buckets_url)
         return 'error'
@@ -462,7 +466,11 @@
     if rate_file.getcode() != 200:
         logging.error('HTTP error retrieving %s' % rate_url)
         return 'error'
-    rate_data = json.load(rate_file)
+    try:
+        rate_data = json.load(rate_file)
+    except json.decoder.JSONDecodeError:
+        logging.error('Error getting rate at %s' % rate_url)
+        return 'error'
     if 'error_message' in rate_data.keys():
         logging.error('Error getting rate at %s' % rate_url)
         return 'error'