Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #36 from bjorkegeek/master

Fixes changes() always timing out after 20 seconds
  • Loading branch information...
commit f985d430d402717d54b40c320f1828edc2731397 2 parents 2736ec0 + 3a1f1c2
Jyrki Pulliainen nailor authored

Showing 2 changed files with 3 additions and 1 deletion. Show diff stats Hide diff stats

  1. +1 0  AUTHORS
  2. +2 1  trombi/client.py
1  AUTHORS
@@ -7,5 +7,6 @@ Since open sourcing it following people have helped to develope it
7 7 further (in alphabetical order by last name):
8 8
9 9 - Jarrod Baumann (https://github.com/jarrodb)
  10 +- David Björkevik (https://github.com/bjorkegeek)
10 11 - Jeremy Kelley (https://github.com/nod)
11 12 - Daniel Truemper (https://github.com/retresco)
3  trombi/client.py
@@ -673,11 +673,12 @@ def _stream(text):
673 673
674 674 couchdb_params = kw
675 675 couchdb_params['feed'] = feed
  676 + params = dict()
676 677 if timeout is not None:
677 678 # CouchDB takes timeouts in milliseconds
678 679 couchdb_params['timeout'] = timeout * 1000
  680 + params['request_timeout'] = timeout + 1
679 681 url = '_changes?%s' % urlencode(couchdb_params)
680   - params = dict()
681 682 if feed == 'continuous':
682 683 params['streaming_callback'] = _stream
683 684

0 comments on commit f985d43

Please sign in to comment.
Something went wrong with that request. Please try again.