Permalink
Browse files

Merge pull request #36 from bjorkegeek/master

Fixes changes() always timing out after 20 seconds
  • Loading branch information...
2 parents 2736ec0 + 3a1f1c2 commit f985d430d402717d54b40c320f1828edc2731397 @nailor nailor committed May 5, 2012
Showing with 3 additions and 1 deletion.
  1. +1 −0 AUTHORS
  2. +2 −1 trombi/client.py
View
1 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)
View
3 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

0 comments on commit f985d43

Please sign in to comment.