diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-06-11 10:32:13 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-06-11 10:32:13 -0300 |
| commit | 7a737ff200c63e7d3a2dc5619b619e07b56fc6a2 (patch) | |
| tree | 176e7056c95675ede38d6d9dce6c085777bb700b | |
| parent | 194ff4c40047462e112737a74968ec21a75bfba7 (diff) | |
Make request timeouts modifiable
| -rw-r--r-- | changes/bug_modifiable_timeout | 3 | ||||
| -rw-r--r-- | src/leap/soledad/__init__.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug_modifiable_timeout b/changes/bug_modifiable_timeout new file mode 100644 index 00000000..be690d5a --- /dev/null +++ b/changes/bug_modifiable_timeout @@ -0,0 +1,3 @@ + o Database request have default timeout too high, a + soledad.SOLEDAD_TIMEOUT variable has been added in order to have + more control over this. Fixes #2713
\ No newline at end of file diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py index ea3f676b..21457caf 100644 --- a/src/leap/soledad/__init__.py +++ b/src/leap/soledad/__init__.py @@ -1073,6 +1073,9 @@ class Soledad(object): # Monkey patching u1db to be able to provide a custom SSL cert #----------------------------------------------------------------------------- +# We need a more reasonable timeout (in seconds) +SOLEDAD_TIMEOUT = 10 + class VerifiedHTTPSConnection(httplib.HTTPSConnection): """HTTPSConnection verifying server side certificates.""" # derived from httplib.py @@ -1080,7 +1083,7 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection): def connect(self): "Connect to a host on a given (SSL) port." sock = socket.create_connection((self.host, self.port), - self.timeout, self.source_address) + SOLEDAD_TIMEOUT, self.source_address) if self._tunnel_host: self.sock = sock self._tunnel() |