Merge pull request #36 from bjorkegeek/master

Fixes changes() always timing out after 20 seconds
inoi · May 5, 2012 · f985d43 · f985d43
2 parents 2736ec0 + 3a1f1c2
commit f985d43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -7,5 +7,6 @@ Since open sourcing it following people have helped to develope it
 further (in alphabetical order by last name):
 
 - Jarrod Baumann (https://github.com/jarrodb)
+- David Björkevik (https://github.com/bjorkegeek)
 - Jeremy Kelley (https://github.com/nod)
 - Daniel Truemper (https://github.com/retresco)
diff --git a/trombi/client.py b/trombi/client.py
@@ -673,11 +673,12 @@ def _stream(text):
 
         couchdb_params = kw
         couchdb_params['feed'] = feed
+        params = dict()
         if timeout is not None:
             # CouchDB takes timeouts in milliseconds
             couchdb_params['timeout'] = timeout * 1000
+            params['request_timeout'] = timeout + 1
         url = '_changes?%s' % urlencode(couchdb_params)
-        params = dict()
         if feed == 'continuous':
             params['streaming_callback'] = _stream