Merge lp:~smoser/ubuntu/precise/apport/ec2-metadata-timeout into lp:~ubuntu-core-dev/ubuntu/precise/apport/ubuntu

[Scott Moser]

timeout on attempts to contact ec2 metadata service

Instead of hanging forever, timeout after 5 seconds. Any reasonable metadata service would come back in that amount of time.

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2012-04-02 15:48:09 +0000
+++ data/general-hooks/ubuntu.py	2012-04-03 04:48:17 +0000
@@ -269,7 +269,7 @@
         ami_id_url = urljoin(metadata_url, 'ami-id')
 
         try:
-            ami = urlopen(ami_id_url).read()
+            ami = urlopen(ami_id_url, timeout=5).read()
         except:
             ami = None
 
@@ -287,7 +287,8 @@
             report['Ec2AMI'] = ami
             for key,value in fields.items():
                 try:
-                    report[key]=urlopen(urljoin(metadata_url, value)).read()
+                    report[key]=urlopen(urljoin(metadata_url, value),
+                                        timeout=5).read()
                 except:
                     report[key]='unavailable'
         else:

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-02 15:48:09 +0000
+++ debian/changelog	2012-04-03 04:48:17 +0000
@@ -1,9 +1,14 @@
 apport (2.0-0ubuntu3) UNRELEASED; urgency=low
 
+  [Martin Pitt]
   * data/general-hooks/ubuntu.py: Do not capture stderr of lsb_release.
     (LP: #955111)
 
- -- Martin Pitt <[e-mail]>  Mon, 02 Apr 2012 17:47:50 +0200
+  [Scott Moser]
+  * data/general-hooks/ubuntu.py: timeout on attempts to contact ec2 metadata
+    service (LP: #855651)
+
+ -- Scott Moser <[e-mail]>  Tue, 03 Apr 2012 00:44:10 -0400
 
 apport (2.0-0ubuntu2) precise; urgency=low