Merge lp:~mterry/ubuntuone-couch/longer-timeout into lp:ubuntuone-couch

[Michael Terry]

Increase httplib2 timeout to 10 seconds

Once the fix for bug 784710 is merged, one can use auth.request for PUT requests. But the Ubuntu One file service always seems to time out using the default timeout value.

That is, the files get to the server alright and are visible, but SSL times out waiting for the response from the server. It always gives a "ssl.SSLError: The read operation timed out" message.

I've found that increasing the timeout to 10 reliably avoids that error for me. With the default timeout, I always hit the error.

[Eric Casteleijn (thisfred)]

Would be happy to accept this, but the diff shows a conflict, likely because the other branch was already merged. Could you pull again/remerge trunk, and push again?

review: Needs Fixing

[lp:~mterry/ubuntuone-couch/longer-timeout]

9. By Michael Terry on 2011-05-23

merge from trunk

[Michael Terry (mterry)]

Oh, whoops! Updated.

[Eric Casteleijn (thisfred)]

Great!

review: Approve

[dobey (dobey)]

That's a bit odd. I would have expected the default timeout to be 30 seconds? (Or 600 seconds, which is the standard default TCP timeout in the networking stack.)

review: Approve

=== modified file 'ubuntuone/couch/auth.py'
--- ubuntuone/couch/auth.py	2011-05-19 19:52:36 +0000
+++ ubuntuone/couch/auth.py	2011-05-23 17:19:27 +0000
@@ -111,6 +111,6 @@
         consumer, token, url, http_method, signature_method)
     headers = headers or {}
     headers.update(oauth_header)
-    http = httplib2.Http()
+    http = httplib2.Http(timeout=10)
     return http.request(
         url, method=http_method, headers=headers, body=request_body)