HH-123895 increase request timeout#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicholasgribanov merged 1 commit into from
Feb 10, 2021
Merged

HH-123895 increase request timeout #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions consul/aio.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import warnings

import aiohttp
from aiohttp import ClientTimeout

from consul import base

Expand All@@ -20,10 +21,10 @@ def __init__(self, *args, loop=None, **kwargs):
self._session = None
self._loop = loop or asyncio.get_event_loop()

async def _request(self, callback, method, uri, data=None, headers=None):
async def _request(self, callback, method, uri, data=None, headers=None, total_timeout=None):
connector = aiohttp.TCPConnector(loop=self._loop,
verify_ssl=self.verify)
async with aiohttp.ClientSession(connector=connector) as session:
async with aiohttp.ClientSession(connector=connector, timeout=ClientTimeout(total=total_timeout)) as session:
self._session = session
resp = await session.request(method=method,
url=uri,
Expand All@@ -47,9 +48,9 @@ def __del__(self):
ResourceWarning)
asyncio.ensure_future(self.close())

async def get(self, callback, path, params=None, headers=None):
async def get(self, callback, path, params=None, headers=None, total_timeout=None):
uri = self.uri(path, params)
return await self._request(callback, 'GET', uri, headers=headers)
return await self._request(callback, 'GET', uri, headers=headers, total_timeout=total_timeout)

async def put(self, callback, path, params=None, data='', headers=None):
uri = self.uri(path, params)
Expand Down
23 changes: 20 additions & 3 deletions consul/base.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import json
import logging
import os
import re
import warnings

import six
Expand DownExpand Up@@ -316,7 +317,7 @@ def uri(self, path, params=None):
return uri

@abc.abstractmethod
def get(self, callback, path, params=None, headers=None):
def get(self, callback, path, params=None, headers=None, total_timeout=None):
raise NotImplementedError

@abc.abstractmethod
Expand DownExpand Up@@ -2955,7 +2956,8 @@ def get(
consistency=None,
keys=False,
separator=None,
dc=None):
dc=None,
total_timeout=None):
"""
Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3002,6 +3004,10 @@ def get(
if index:
params.append(('index', index))
if wait:
assert total_timeout, \
'total_timeout should be setted'
assert not self._convert_wait_to_seconds(wait) >= total_timeout, \
f'wait: {wait} should be less than total_timeout: {total_timeout}s'
params.append(('wait', wait))
if recurse:
params.append(('recurse', '1'))
Expand DownExpand Up@@ -3030,7 +3036,18 @@ def get(
CB.json(index=True, decode=decode, one=one,
map=lambda x: x if x else None),
path='/v1/kv/%s' % key,
params=params, headers=headers)
params=params, headers=headers, total_timeout=total_timeout)

def _convert_wait_to_seconds(self, wait):
unit_to_seconds_multiplier = {
'ms': 0.001,
's': 1,
'm': 60
}
wait_digit = int(re.search(r'\d+', wait).group())
multiplier = unit_to_seconds_multiplier[re.search(r'ms|s|m', wait).group()]

return wait_digit * multiplier

def put(
self,
Expand Down
2 changes: 1 addition & 1 deletion consul/std.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ def response(response):
response.text,
response.content)

def get(self, callback, path, params=None, headers=None):
def get(self, callback, path, params=None, headers=None, total_timeout=None):
uri = self.uri(path, params)
return callback(self.response(
self.session.get(uri,
Expand Down
5 changes: 3 additions & 2 deletions consul/tornado.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,13 @@ def _request(self, callback, request):
response = e.response
raise gen.Return(callback(self.response(response)))

def get(self, callback, path, params=None, headers=None):
def get(self, callback, path, params=None, headers=None, total_timeout=None):
uri = self.uri(path, params)
request = httpclient.HTTPRequest(uri,
method='GET',
validate_cert=self.verify,
headers=headers)
headers=headers,
connect_timeout=total_timeout)
return self._request(callback, request)

def put(self, callback, path, params=None, data='', headers=None):
Expand Down
5 changes: 3 additions & 2 deletions consul/twisted.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,14 @@ def request(self, callback, method, url, **kwargs):
'Request incomplete: {} {}'.format(method.upper(), url))

@inlineCallbacks
def get(self, callback, path, params=None, headers=None):
def get(self, callback, path, params=None, headers=None, total_timeout=None):
uri = self.uri(path, params)
response = yield self.request(callback,
'get',
uri,
params=params,
headers=headers)
headers=headers,
total_timeout=total_timeout)
returnValue(response)

@inlineCallbacks
Expand Down
14 changes: 7 additions & 7 deletions tests/test_base.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,22 +11,22 @@
Response = consul.base.Response

Request = collections.namedtuple(
'Request', ['method', 'path', 'params', 'data', 'headers'])
'Request', ['method', 'path', 'params', 'data', 'headers', 'total_timeout'])


class HTTPClient(object):
def __init__(self, host=None, port=None, scheme=None,
verify=True, cert=None, timeout=None, headers=None):
pass

def get(self, callback, path, params=None, headers=None):
return Request('get', path, params, None, headers)
def get(self, callback, path, params=None, headers=None, total_timeout=None):
return Request('get', path, params, None, headers, total_timeout)

def put(self, callback, path, params=None, data='', headers=None):
return Request('put', path, params, data, headers)
def put(self, callback, path, params=None, data='', headers=None, total_timeout=None):
return Request('put', path, params, data, headers, total_timeout)

def delete(self, callback, path, params=None, headers=None):
return Request('delete', path, params, None, headers)
def delete(self, callback, path, params=None, headers=None, total_timeout=None):
return Request('delete', path, params, None, headers, total_timeout)


class Consul(consul.base.Consul):
Expand Down
48 changes: 46 additions & 2 deletions tests/test_std.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,13 +31,57 @@ def test_kv(self, consul_port):
index, data = c.kv.get('foo')
assert data['Value'] == six.b('bar')

def test_kv_wait(self, consul_port):
def test_kv_wait_ms(self, consul_port):
c = consul.Consul(port=consul_port)
assert c.kv.put('foo', 'bar') is True
index, data = c.kv.get('foo')
check, data = c.kv.get('foo', index=index, wait='20ms')
check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
assert index == check

def test_kv_wait_s(self, consul_port):
c = consul.Consul(port=consul_port)
assert c.kv.put('foo', 'bar') is True
index, data = c.kv.get('foo')
check, data = c.kv.get('foo', index=index, wait='20s', total_timeout=30)
assert index == check

def test_kv_wait_m(self, consul_port):
c = consul.Consul(port=consul_port)
assert c.kv.put('foo', 'bar') is True
index, data = c.kv.get('foo')
check, data = c.kv.get('foo', index=index, wait='1m', total_timeout=61)
assert index == check

def test_kv_wait_more_timeout_ms(self, consul_port):
c = consul.Consul(port=consul_port)
assert c.kv.put('foo', 'bar') is True
index, data = c.kv.get('foo')
pytest.raises(
AssertionError,
c.kv.get,
'foo', index=index, wait='20ms', total_timeout=0
)

def test_kv_wait_more_timeout_s(self, consul_port):
c = consul.Consul(port=consul_port)
assert c.kv.put('foo', 'bar') is True
index, data = c.kv.get('foo')
pytest.raises(
AssertionError,
c.kv.get,
'foo', index=index, wait='20s', total_timeout=19
)

def test_kv_wait_more_timeout_m(self, consul_port):
c = consul.Consul(port=consul_port)
assert c.kv.put('foo', 'bar') is True
index, data = c.kv.get('foo')
pytest.raises(
AssertionError,
c.kv.get,
'foo', index=index, wait='1m', total_timeout=59
)

def test_kv_encoding(self, consul_port):
c = consul.Consul(port=consul_port)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_std_token.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ def test_kv_wait(self, acl_consul):
c = consul.Consul(port=acl_consul.port, token=acl_consul.token)
assert c.kv.put('foo', 'bar') is True
index, data = c.kv.get('foo')
check, data = c.kv.get('foo', index=index, wait='20ms')
check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
assert index == check

def test_kv_encoding(self, acl_consul):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
HH-123895 increase request timeout#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicholasgribanov
merged 1 commit into

from

Feb 10, 2021
 Merged


HH-123895 increase request timeout
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
consul/aio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import warnings

import aiohttp
from aiohttp import ClientTimeout

from consul import base

Expand All@@ -20,10 +21,10 @@ def __init__(self, *args, loop=None, **kwargs):
 self._session = None
 self._loop = loop or asyncio.get_event_loop()

 async def _request(self, callback, method, uri, data=None, headers=None):
 async def _request(self, callback, method, uri, data=None, headers=None, total_timeout=None):
 connector = aiohttp.TCPConnector(loop=self._loop,
 verify_ssl=self.verify)
 async with aiohttp.ClientSession(connector=connector) as session:
 async with aiohttp.ClientSession(connector=connector, timeout=ClientTimeout(total=total_timeout)) as session:
 self._session = session
 resp = await session.request(method=method,
 url=uri,
Expand All@@ -47,9 +48,9 @@ def __del__(self):
 ResourceWarning)
 asyncio.ensure_future(self.close())

 async def get(self, callback, path, params=None, headers=None):
 async def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return await self._request(callback, 'GET', uri, headers=headers)
 return await self._request(callback, 'GET', uri, headers=headers, total_timeout=total_timeout)

 async def put(self, callback, path, params=None, data='', headers=None):
 uri = self.uri(path, params)
Expand Down

23 changes: 20 additions & 3 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import json
import logging
import os
import re
import warnings

import six
Expand DownExpand Up@@ -316,7 +317,7 @@ def uri(self, path, params=None):
 return uri

 @abc.abstractmethod
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 raise NotImplementedError

 @abc.abstractmethod
Expand DownExpand Up@@ -2955,7 +2956,8 @@ def get(
 consistency=None,
 keys=False,
 separator=None,
 dc=None):
 dc=None,
 total_timeout=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3002,6 +3004,10 @@ def get(
 if index:
 params.append(('index', index))
 if wait:
 assert total_timeout, \
 'total_timeout should be setted'
 assert not self._convert_wait_to_seconds(wait) >= total_timeout, \
 f'wait: {wait} should be less than total_timeout: {total_timeout}s'
 params.append(('wait', wait))
 if recurse:
 params.append(('recurse', '1'))
Expand DownExpand Up@@ -3030,7 +3036,18 @@ def get(
 CB.json(index=True, decode=decode, one=one,
 map=lambda x: x if x else None),
 path='/v1/kv/%s' % key,
 params=params, headers=headers)
 params=params, headers=headers, total_timeout=total_timeout)

 def _convert_wait_to_seconds(self, wait):
 unit_to_seconds_multiplier = {
 'ms': 0.001,
 's': 1,
 'm': 60
 }
 wait_digit = int(re.search(r'\d+', wait).group())
 multiplier = unit_to_seconds_multiplier[re.search(r'ms|s|m', wait).group()]

 return wait_digit * multiplier

 def put(
 self,
Expand Down

2 changes: 1 addition & 1 deletion
consul/std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ def response(response):
 response.text,
 response.content)

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return callback(self.response(
 self.session.get(uri,
Expand Down

5 changes: 3 additions & 2 deletions
consul/tornado.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,13 @@ def _request(self, callback, request):
 response = e.response
 raise gen.Return(callback(self.response(response)))

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 request = httpclient.HTTPRequest(uri,
 method='GET',
 validate_cert=self.verify,
 headers=headers)
 headers=headers,
 connect_timeout=total_timeout)
 return self._request(callback, request)

 def put(self, callback, path, params=None, data='', headers=None):
Expand Down

5 changes: 3 additions & 2 deletions
consul/twisted.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,14 @@ def request(self, callback, method, url, **kwargs):
 'Request incomplete: {} {}'.format(method.upper(), url))

 @inlineCallbacks
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 response = yield self.request(callback,
 'get',
 uri,
 params=params,
 headers=headers)
 headers=headers,
 total_timeout=total_timeout)
 returnValue(response)

 @inlineCallbacks
Expand Down

14 changes: 7 additions & 7 deletions
tests/test_base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,22 +11,22 @@
Response = consul.base.Response

Request = collections.namedtuple(
 'Request', ['method', 'path', 'params', 'data', 'headers'])
 'Request', ['method', 'path', 'params', 'data', 'headers', 'total_timeout'])


class HTTPClient(object):
 def __init__(self, host=None, port=None, scheme=None,
 verify=True, cert=None, timeout=None, headers=None):
 pass

 def get(self, callback, path, params=None, headers=None):
 return Request('get', path, params, None, headers)
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('get', path, params, None, headers, total_timeout)

 def put(self, callback, path, params=None, data='', headers=None):
 return Request('put', path, params, data, headers)
 def put(self, callback, path, params=None, data='', headers=None, total_timeout=None):
 return Request('put', path, params, data, headers, total_timeout)

 def delete(self, callback, path, params=None, headers=None):
 return Request('delete', path, params, None, headers)
 def delete(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('delete', path, params, None, headers, total_timeout)


class Consul(consul.base.Consul):
Expand Down

48 changes: 46 additions & 2 deletions
tests/test_std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,13 +31,57 @@ def test_kv(self, consul_port):
 index, data = c.kv.get('foo')
 assert data['Value'] == six.b('bar')

 def test_kv_wait(self, consul_port):
 def test_kv_wait_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_wait_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20s', total_timeout=30)
 assert index == check

 def test_kv_wait_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='1m', total_timeout=61)
 assert index == check

 def test_kv_wait_more_timeout_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20ms', total_timeout=0
 )

 def test_kv_wait_more_timeout_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20s', total_timeout=19
 )

 def test_kv_wait_more_timeout_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='1m', total_timeout=59
 )

 def test_kv_encoding(self, consul_port):
 c = consul.Consul(port=consul_port)

Expand Down

2 changes: 1 addition & 1 deletion
tests/test_std_token.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ def test_kv_wait(self, acl_consul):
 c = consul.Consul(port=acl_consul.port, token=acl_consul.token)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_encoding(self, acl_consul):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
HH-123895 increase request timeout#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicholasgribanov
merged 1 commit into

from

Feb 10, 2021
 Merged


HH-123895 increase request timeout
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
consul/aio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import warnings

import aiohttp
from aiohttp import ClientTimeout

from consul import base

Expand All@@ -20,10 +21,10 @@ def __init__(self, *args, loop=None, **kwargs):
 self._session = None
 self._loop = loop or asyncio.get_event_loop()

 async def _request(self, callback, method, uri, data=None, headers=None):
 async def _request(self, callback, method, uri, data=None, headers=None, total_timeout=None):
 connector = aiohttp.TCPConnector(loop=self._loop,
 verify_ssl=self.verify)
 async with aiohttp.ClientSession(connector=connector) as session:
 async with aiohttp.ClientSession(connector=connector, timeout=ClientTimeout(total=total_timeout)) as session:
 self._session = session
 resp = await session.request(method=method,
 url=uri,
Expand All@@ -47,9 +48,9 @@ def __del__(self):
 ResourceWarning)
 asyncio.ensure_future(self.close())

 async def get(self, callback, path, params=None, headers=None):
 async def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return await self._request(callback, 'GET', uri, headers=headers)
 return await self._request(callback, 'GET', uri, headers=headers, total_timeout=total_timeout)

 async def put(self, callback, path, params=None, data='', headers=None):
 uri = self.uri(path, params)
Expand Down

23 changes: 20 additions & 3 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import json
import logging
import os
import re
import warnings

import six
Expand DownExpand Up@@ -316,7 +317,7 @@ def uri(self, path, params=None):
 return uri

 @abc.abstractmethod
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 raise NotImplementedError

 @abc.abstractmethod
Expand DownExpand Up@@ -2955,7 +2956,8 @@ def get(
 consistency=None,
 keys=False,
 separator=None,
 dc=None):
 dc=None,
 total_timeout=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3002,6 +3004,10 @@ def get(
 if index:
 params.append(('index', index))
 if wait:
 assert total_timeout, \
 'total_timeout should be setted'
 assert not self._convert_wait_to_seconds(wait) >= total_timeout, \
 f'wait: {wait} should be less than total_timeout: {total_timeout}s'
 params.append(('wait', wait))
 if recurse:
 params.append(('recurse', '1'))
Expand DownExpand Up@@ -3030,7 +3036,18 @@ def get(
 CB.json(index=True, decode=decode, one=one,
 map=lambda x: x if x else None),
 path='/v1/kv/%s' % key,
 params=params, headers=headers)
 params=params, headers=headers, total_timeout=total_timeout)

 def _convert_wait_to_seconds(self, wait):
 unit_to_seconds_multiplier = {
 'ms': 0.001,
 's': 1,
 'm': 60
 }
 wait_digit = int(re.search(r'\d+', wait).group())
 multiplier = unit_to_seconds_multiplier[re.search(r'ms|s|m', wait).group()]

 return wait_digit * multiplier

 def put(
 self,
Expand Down

2 changes: 1 addition & 1 deletion
consul/std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ def response(response):
 response.text,
 response.content)

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return callback(self.response(
 self.session.get(uri,
Expand Down

5 changes: 3 additions & 2 deletions
consul/tornado.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,13 @@ def _request(self, callback, request):
 response = e.response
 raise gen.Return(callback(self.response(response)))

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 request = httpclient.HTTPRequest(uri,
 method='GET',
 validate_cert=self.verify,
 headers=headers)
 headers=headers,
 connect_timeout=total_timeout)
 return self._request(callback, request)

 def put(self, callback, path, params=None, data='', headers=None):
Expand Down

5 changes: 3 additions & 2 deletions
consul/twisted.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,14 @@ def request(self, callback, method, url, **kwargs):
 'Request incomplete: {} {}'.format(method.upper(), url))

 @inlineCallbacks
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 response = yield self.request(callback,
 'get',
 uri,
 params=params,
 headers=headers)
 headers=headers,
 total_timeout=total_timeout)
 returnValue(response)

 @inlineCallbacks
Expand Down

14 changes: 7 additions & 7 deletions
tests/test_base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,22 +11,22 @@
Response = consul.base.Response

Request = collections.namedtuple(
 'Request', ['method', 'path', 'params', 'data', 'headers'])
 'Request', ['method', 'path', 'params', 'data', 'headers', 'total_timeout'])


class HTTPClient(object):
 def __init__(self, host=None, port=None, scheme=None,
 verify=True, cert=None, timeout=None, headers=None):
 pass

 def get(self, callback, path, params=None, headers=None):
 return Request('get', path, params, None, headers)
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('get', path, params, None, headers, total_timeout)

 def put(self, callback, path, params=None, data='', headers=None):
 return Request('put', path, params, data, headers)
 def put(self, callback, path, params=None, data='', headers=None, total_timeout=None):
 return Request('put', path, params, data, headers, total_timeout)

 def delete(self, callback, path, params=None, headers=None):
 return Request('delete', path, params, None, headers)
 def delete(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('delete', path, params, None, headers, total_timeout)


class Consul(consul.base.Consul):
Expand Down

48 changes: 46 additions & 2 deletions
tests/test_std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,13 +31,57 @@ def test_kv(self, consul_port):
 index, data = c.kv.get('foo')
 assert data['Value'] == six.b('bar')

 def test_kv_wait(self, consul_port):
 def test_kv_wait_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_wait_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20s', total_timeout=30)
 assert index == check

 def test_kv_wait_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='1m', total_timeout=61)
 assert index == check

 def test_kv_wait_more_timeout_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20ms', total_timeout=0
 )

 def test_kv_wait_more_timeout_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20s', total_timeout=19
 )

 def test_kv_wait_more_timeout_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='1m', total_timeout=59
 )

 def test_kv_encoding(self, consul_port):
 c = consul.Consul(port=consul_port)

Expand Down

2 changes: 1 addition & 1 deletion
tests/test_std_token.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ def test_kv_wait(self, acl_consul):
 c = consul.Consul(port=acl_consul.port, token=acl_consul.token)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_encoding(self, acl_consul):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
HH-123895 increase request timeout#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicholasgribanov
merged 1 commit into

from

Feb 10, 2021
 Merged


HH-123895 increase request timeout
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
consul/aio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import warnings

import aiohttp
from aiohttp import ClientTimeout

from consul import base

Expand All@@ -20,10 +21,10 @@ def __init__(self, *args, loop=None, **kwargs):
 self._session = None
 self._loop = loop or asyncio.get_event_loop()

 async def _request(self, callback, method, uri, data=None, headers=None):
 async def _request(self, callback, method, uri, data=None, headers=None, total_timeout=None):
 connector = aiohttp.TCPConnector(loop=self._loop,
 verify_ssl=self.verify)
 async with aiohttp.ClientSession(connector=connector) as session:
 async with aiohttp.ClientSession(connector=connector, timeout=ClientTimeout(total=total_timeout)) as session:
 self._session = session
 resp = await session.request(method=method,
 url=uri,
Expand All@@ -47,9 +48,9 @@ def __del__(self):
 ResourceWarning)
 asyncio.ensure_future(self.close())

 async def get(self, callback, path, params=None, headers=None):
 async def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return await self._request(callback, 'GET', uri, headers=headers)
 return await self._request(callback, 'GET', uri, headers=headers, total_timeout=total_timeout)

 async def put(self, callback, path, params=None, data='', headers=None):
 uri = self.uri(path, params)
Expand Down

23 changes: 20 additions & 3 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import json
import logging
import os
import re
import warnings

import six
Expand DownExpand Up@@ -316,7 +317,7 @@ def uri(self, path, params=None):
 return uri

 @abc.abstractmethod
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 raise NotImplementedError

 @abc.abstractmethod
Expand DownExpand Up@@ -2955,7 +2956,8 @@ def get(
 consistency=None,
 keys=False,
 separator=None,
 dc=None):
 dc=None,
 total_timeout=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3002,6 +3004,10 @@ def get(
 if index:
 params.append(('index', index))
 if wait:
 assert total_timeout, \
 'total_timeout should be setted'
 assert not self._convert_wait_to_seconds(wait) >= total_timeout, \
 f'wait: {wait} should be less than total_timeout: {total_timeout}s'
 params.append(('wait', wait))
 if recurse:
 params.append(('recurse', '1'))
Expand DownExpand Up@@ -3030,7 +3036,18 @@ def get(
 CB.json(index=True, decode=decode, one=one,
 map=lambda x: x if x else None),
 path='/v1/kv/%s' % key,
 params=params, headers=headers)
 params=params, headers=headers, total_timeout=total_timeout)

 def _convert_wait_to_seconds(self, wait):
 unit_to_seconds_multiplier = {
 'ms': 0.001,
 's': 1,
 'm': 60
 }
 wait_digit = int(re.search(r'\d+', wait).group())
 multiplier = unit_to_seconds_multiplier[re.search(r'ms|s|m', wait).group()]

 return wait_digit * multiplier

 def put(
 self,
Expand Down

2 changes: 1 addition & 1 deletion
consul/std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ def response(response):
 response.text,
 response.content)

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return callback(self.response(
 self.session.get(uri,
Expand Down

5 changes: 3 additions & 2 deletions
consul/tornado.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,13 @@ def _request(self, callback, request):
 response = e.response
 raise gen.Return(callback(self.response(response)))

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 request = httpclient.HTTPRequest(uri,
 method='GET',
 validate_cert=self.verify,
 headers=headers)
 headers=headers,
 connect_timeout=total_timeout)
 return self._request(callback, request)

 def put(self, callback, path, params=None, data='', headers=None):
Expand Down

5 changes: 3 additions & 2 deletions
consul/twisted.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,14 @@ def request(self, callback, method, url, **kwargs):
 'Request incomplete: {} {}'.format(method.upper(), url))

 @inlineCallbacks
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 response = yield self.request(callback,
 'get',
 uri,
 params=params,
 headers=headers)
 headers=headers,
 total_timeout=total_timeout)
 returnValue(response)

 @inlineCallbacks
Expand Down

14 changes: 7 additions & 7 deletions
tests/test_base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,22 +11,22 @@
Response = consul.base.Response

Request = collections.namedtuple(
 'Request', ['method', 'path', 'params', 'data', 'headers'])
 'Request', ['method', 'path', 'params', 'data', 'headers', 'total_timeout'])


class HTTPClient(object):
 def __init__(self, host=None, port=None, scheme=None,
 verify=True, cert=None, timeout=None, headers=None):
 pass

 def get(self, callback, path, params=None, headers=None):
 return Request('get', path, params, None, headers)
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('get', path, params, None, headers, total_timeout)

 def put(self, callback, path, params=None, data='', headers=None):
 return Request('put', path, params, data, headers)
 def put(self, callback, path, params=None, data='', headers=None, total_timeout=None):
 return Request('put', path, params, data, headers, total_timeout)

 def delete(self, callback, path, params=None, headers=None):
 return Request('delete', path, params, None, headers)
 def delete(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('delete', path, params, None, headers, total_timeout)


class Consul(consul.base.Consul):
Expand Down

48 changes: 46 additions & 2 deletions
tests/test_std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,13 +31,57 @@ def test_kv(self, consul_port):
 index, data = c.kv.get('foo')
 assert data['Value'] == six.b('bar')

 def test_kv_wait(self, consul_port):
 def test_kv_wait_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_wait_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20s', total_timeout=30)
 assert index == check

 def test_kv_wait_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='1m', total_timeout=61)
 assert index == check

 def test_kv_wait_more_timeout_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20ms', total_timeout=0
 )

 def test_kv_wait_more_timeout_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20s', total_timeout=19
 )

 def test_kv_wait_more_timeout_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='1m', total_timeout=59
 )

 def test_kv_encoding(self, consul_port):
 c = consul.Consul(port=consul_port)

Expand Down

2 changes: 1 addition & 1 deletion
tests/test_std_token.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ def test_kv_wait(self, acl_consul):
 c = consul.Consul(port=acl_consul.port, token=acl_consul.token)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_encoding(self, acl_consul):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
HH-123895 increase request timeout#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicholasgribanov
merged 1 commit into

from

Feb 10, 2021
 Merged


HH-123895 increase request timeout
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
consul/aio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import warnings

import aiohttp
from aiohttp import ClientTimeout

from consul import base

Expand All@@ -20,10 +21,10 @@ def __init__(self, *args, loop=None, **kwargs):
 self._session = None
 self._loop = loop or asyncio.get_event_loop()

 async def _request(self, callback, method, uri, data=None, headers=None):
 async def _request(self, callback, method, uri, data=None, headers=None, total_timeout=None):
 connector = aiohttp.TCPConnector(loop=self._loop,
 verify_ssl=self.verify)
 async with aiohttp.ClientSession(connector=connector) as session:
 async with aiohttp.ClientSession(connector=connector, timeout=ClientTimeout(total=total_timeout)) as session:
 self._session = session
 resp = await session.request(method=method,
 url=uri,
Expand All@@ -47,9 +48,9 @@ def __del__(self):
 ResourceWarning)
 asyncio.ensure_future(self.close())

 async def get(self, callback, path, params=None, headers=None):
 async def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return await self._request(callback, 'GET', uri, headers=headers)
 return await self._request(callback, 'GET', uri, headers=headers, total_timeout=total_timeout)

 async def put(self, callback, path, params=None, data='', headers=None):
 uri = self.uri(path, params)
Expand Down

23 changes: 20 additions & 3 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import json
import logging
import os
import re
import warnings

import six
Expand DownExpand Up@@ -316,7 +317,7 @@ def uri(self, path, params=None):
 return uri

 @abc.abstractmethod
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 raise NotImplementedError

 @abc.abstractmethod
Expand DownExpand Up@@ -2955,7 +2956,8 @@ def get(
 consistency=None,
 keys=False,
 separator=None,
 dc=None):
 dc=None,
 total_timeout=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3002,6 +3004,10 @@ def get(
 if index:
 params.append(('index', index))
 if wait:
 assert total_timeout, \
 'total_timeout should be setted'
 assert not self._convert_wait_to_seconds(wait) >= total_timeout, \
 f'wait: {wait} should be less than total_timeout: {total_timeout}s'
 params.append(('wait', wait))
 if recurse:
 params.append(('recurse', '1'))
Expand DownExpand Up@@ -3030,7 +3036,18 @@ def get(
 CB.json(index=True, decode=decode, one=one,
 map=lambda x: x if x else None),
 path='/v1/kv/%s' % key,
 params=params, headers=headers)
 params=params, headers=headers, total_timeout=total_timeout)

 def _convert_wait_to_seconds(self, wait):
 unit_to_seconds_multiplier = {
 'ms': 0.001,
 's': 1,
 'm': 60
 }
 wait_digit = int(re.search(r'\d+', wait).group())
 multiplier = unit_to_seconds_multiplier[re.search(r'ms|s|m', wait).group()]

 return wait_digit * multiplier

 def put(
 self,
Expand Down

2 changes: 1 addition & 1 deletion
consul/std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ def response(response):
 response.text,
 response.content)

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return callback(self.response(
 self.session.get(uri,
Expand Down

5 changes: 3 additions & 2 deletions
consul/tornado.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,13 @@ def _request(self, callback, request):
 response = e.response
 raise gen.Return(callback(self.response(response)))

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 request = httpclient.HTTPRequest(uri,
 method='GET',
 validate_cert=self.verify,
 headers=headers)
 headers=headers,
 connect_timeout=total_timeout)
 return self._request(callback, request)

 def put(self, callback, path, params=None, data='', headers=None):
Expand Down

5 changes: 3 additions & 2 deletions
consul/twisted.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,14 @@ def request(self, callback, method, url, **kwargs):
 'Request incomplete: {} {}'.format(method.upper(), url))

 @inlineCallbacks
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 response = yield self.request(callback,
 'get',
 uri,
 params=params,
 headers=headers)
 headers=headers,
 total_timeout=total_timeout)
 returnValue(response)

 @inlineCallbacks
Expand Down

14 changes: 7 additions & 7 deletions
tests/test_base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,22 +11,22 @@
Response = consul.base.Response

Request = collections.namedtuple(
 'Request', ['method', 'path', 'params', 'data', 'headers'])
 'Request', ['method', 'path', 'params', 'data', 'headers', 'total_timeout'])


class HTTPClient(object):
 def __init__(self, host=None, port=None, scheme=None,
 verify=True, cert=None, timeout=None, headers=None):
 pass

 def get(self, callback, path, params=None, headers=None):
 return Request('get', path, params, None, headers)
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('get', path, params, None, headers, total_timeout)

 def put(self, callback, path, params=None, data='', headers=None):
 return Request('put', path, params, data, headers)
 def put(self, callback, path, params=None, data='', headers=None, total_timeout=None):
 return Request('put', path, params, data, headers, total_timeout)

 def delete(self, callback, path, params=None, headers=None):
 return Request('delete', path, params, None, headers)
 def delete(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('delete', path, params, None, headers, total_timeout)


class Consul(consul.base.Consul):
Expand Down

48 changes: 46 additions & 2 deletions
tests/test_std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,13 +31,57 @@ def test_kv(self, consul_port):
 index, data = c.kv.get('foo')
 assert data['Value'] == six.b('bar')

 def test_kv_wait(self, consul_port):
 def test_kv_wait_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_wait_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20s', total_timeout=30)
 assert index == check

 def test_kv_wait_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='1m', total_timeout=61)
 assert index == check

 def test_kv_wait_more_timeout_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20ms', total_timeout=0
 )

 def test_kv_wait_more_timeout_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20s', total_timeout=19
 )

 def test_kv_wait_more_timeout_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='1m', total_timeout=59
 )

 def test_kv_encoding(self, consul_port):
 c = consul.Consul(port=consul_port)

Expand Down

2 changes: 1 addition & 1 deletion
tests/test_std_token.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ def test_kv_wait(self, acl_consul):
 c = consul.Consul(port=acl_consul.port, token=acl_consul.token)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_encoding(self, acl_consul):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
HH-123895 increase request timeout#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicholasgribanov
merged 1 commit into

from

Feb 10, 2021
 Merged


HH-123895 increase request timeout
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
consul/aio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import warnings

import aiohttp
from aiohttp import ClientTimeout

from consul import base

Expand All@@ -20,10 +21,10 @@ def __init__(self, *args, loop=None, **kwargs):
 self._session = None
 self._loop = loop or asyncio.get_event_loop()

 async def _request(self, callback, method, uri, data=None, headers=None):
 async def _request(self, callback, method, uri, data=None, headers=None, total_timeout=None):
 connector = aiohttp.TCPConnector(loop=self._loop,
 verify_ssl=self.verify)
 async with aiohttp.ClientSession(connector=connector) as session:
 async with aiohttp.ClientSession(connector=connector, timeout=ClientTimeout(total=total_timeout)) as session:
 self._session = session
 resp = await session.request(method=method,
 url=uri,
Expand All@@ -47,9 +48,9 @@ def __del__(self):
 ResourceWarning)
 asyncio.ensure_future(self.close())

 async def get(self, callback, path, params=None, headers=None):
 async def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return await self._request(callback, 'GET', uri, headers=headers)
 return await self._request(callback, 'GET', uri, headers=headers, total_timeout=total_timeout)

 async def put(self, callback, path, params=None, data='', headers=None):
 uri = self.uri(path, params)
Expand Down

23 changes: 20 additions & 3 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import json
import logging
import os
import re
import warnings

import six
Expand DownExpand Up@@ -316,7 +317,7 @@ def uri(self, path, params=None):
 return uri

 @abc.abstractmethod
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 raise NotImplementedError

 @abc.abstractmethod
Expand DownExpand Up@@ -2955,7 +2956,8 @@ def get(
 consistency=None,
 keys=False,
 separator=None,
 dc=None):
 dc=None,
 total_timeout=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3002,6 +3004,10 @@ def get(
 if index:
 params.append(('index', index))
 if wait:
 assert total_timeout, \
 'total_timeout should be setted'
 assert not self._convert_wait_to_seconds(wait) >= total_timeout, \
 f'wait: {wait} should be less than total_timeout: {total_timeout}s'
 params.append(('wait', wait))
 if recurse:
 params.append(('recurse', '1'))
Expand DownExpand Up@@ -3030,7 +3036,18 @@ def get(
 CB.json(index=True, decode=decode, one=one,
 map=lambda x: x if x else None),
 path='/v1/kv/%s' % key,
 params=params, headers=headers)
 params=params, headers=headers, total_timeout=total_timeout)

 def _convert_wait_to_seconds(self, wait):
 unit_to_seconds_multiplier = {
 'ms': 0.001,
 's': 1,
 'm': 60
 }
 wait_digit = int(re.search(r'\d+', wait).group())
 multiplier = unit_to_seconds_multiplier[re.search(r'ms|s|m', wait).group()]

 return wait_digit * multiplier

 def put(
 self,
Expand Down

2 changes: 1 addition & 1 deletion
consul/std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ def response(response):
 response.text,
 response.content)

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return callback(self.response(
 self.session.get(uri,
Expand Down

5 changes: 3 additions & 2 deletions
consul/tornado.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,13 @@ def _request(self, callback, request):
 response = e.response
 raise gen.Return(callback(self.response(response)))

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 request = httpclient.HTTPRequest(uri,
 method='GET',
 validate_cert=self.verify,
 headers=headers)
 headers=headers,
 connect_timeout=total_timeout)
 return self._request(callback, request)

 def put(self, callback, path, params=None, data='', headers=None):
Expand Down

5 changes: 3 additions & 2 deletions
consul/twisted.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,14 @@ def request(self, callback, method, url, **kwargs):
 'Request incomplete: {} {}'.format(method.upper(), url))

 @inlineCallbacks
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 response = yield self.request(callback,
 'get',
 uri,
 params=params,
 headers=headers)
 headers=headers,
 total_timeout=total_timeout)
 returnValue(response)

 @inlineCallbacks
Expand Down

14 changes: 7 additions & 7 deletions
tests/test_base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,22 +11,22 @@
Response = consul.base.Response

Request = collections.namedtuple(
 'Request', ['method', 'path', 'params', 'data', 'headers'])
 'Request', ['method', 'path', 'params', 'data', 'headers', 'total_timeout'])


class HTTPClient(object):
 def __init__(self, host=None, port=None, scheme=None,
 verify=True, cert=None, timeout=None, headers=None):
 pass

 def get(self, callback, path, params=None, headers=None):
 return Request('get', path, params, None, headers)
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('get', path, params, None, headers, total_timeout)

 def put(self, callback, path, params=None, data='', headers=None):
 return Request('put', path, params, data, headers)
 def put(self, callback, path, params=None, data='', headers=None, total_timeout=None):
 return Request('put', path, params, data, headers, total_timeout)

 def delete(self, callback, path, params=None, headers=None):
 return Request('delete', path, params, None, headers)
 def delete(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('delete', path, params, None, headers, total_timeout)


class Consul(consul.base.Consul):
Expand Down

48 changes: 46 additions & 2 deletions
tests/test_std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,13 +31,57 @@ def test_kv(self, consul_port):
 index, data = c.kv.get('foo')
 assert data['Value'] == six.b('bar')

 def test_kv_wait(self, consul_port):
 def test_kv_wait_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_wait_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20s', total_timeout=30)
 assert index == check

 def test_kv_wait_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='1m', total_timeout=61)
 assert index == check

 def test_kv_wait_more_timeout_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20ms', total_timeout=0
 )

 def test_kv_wait_more_timeout_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20s', total_timeout=19
 )

 def test_kv_wait_more_timeout_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='1m', total_timeout=59
 )

 def test_kv_encoding(self, consul_port):
 c = consul.Consul(port=consul_port)

Expand Down

2 changes: 1 addition & 1 deletion
tests/test_std_token.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ def test_kv_wait(self, acl_consul):
 c = consul.Consul(port=acl_consul.port, token=acl_consul.token)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_encoding(self, acl_consul):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
HH-123895 increase request timeout#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicholasgribanov
merged 1 commit into

from

Feb 10, 2021
 Merged


HH-123895 increase request timeout
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
consul/aio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import warnings

import aiohttp
from aiohttp import ClientTimeout

from consul import base

Expand All@@ -20,10 +21,10 @@ def __init__(self, *args, loop=None, **kwargs):
 self._session = None
 self._loop = loop or asyncio.get_event_loop()

 async def _request(self, callback, method, uri, data=None, headers=None):
 async def _request(self, callback, method, uri, data=None, headers=None, total_timeout=None):
 connector = aiohttp.TCPConnector(loop=self._loop,
 verify_ssl=self.verify)
 async with aiohttp.ClientSession(connector=connector) as session:
 async with aiohttp.ClientSession(connector=connector, timeout=ClientTimeout(total=total_timeout)) as session:
 self._session = session
 resp = await session.request(method=method,
 url=uri,
Expand All@@ -47,9 +48,9 @@ def __del__(self):
 ResourceWarning)
 asyncio.ensure_future(self.close())

 async def get(self, callback, path, params=None, headers=None):
 async def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return await self._request(callback, 'GET', uri, headers=headers)
 return await self._request(callback, 'GET', uri, headers=headers, total_timeout=total_timeout)

 async def put(self, callback, path, params=None, data='', headers=None):
 uri = self.uri(path, params)
Expand Down

23 changes: 20 additions & 3 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import json
import logging
import os
import re
import warnings

import six
Expand DownExpand Up@@ -316,7 +317,7 @@ def uri(self, path, params=None):
 return uri

 @abc.abstractmethod
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 raise NotImplementedError

 @abc.abstractmethod
Expand DownExpand Up@@ -2955,7 +2956,8 @@ def get(
 consistency=None,
 keys=False,
 separator=None,
 dc=None):
 dc=None,
 total_timeout=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3002,6 +3004,10 @@ def get(
 if index:
 params.append(('index', index))
 if wait:
 assert total_timeout, \
 'total_timeout should be setted'
 assert not self._convert_wait_to_seconds(wait) >= total_timeout, \
 f'wait: {wait} should be less than total_timeout: {total_timeout}s'
 params.append(('wait', wait))
 if recurse:
 params.append(('recurse', '1'))
Expand DownExpand Up@@ -3030,7 +3036,18 @@ def get(
 CB.json(index=True, decode=decode, one=one,
 map=lambda x: x if x else None),
 path='/v1/kv/%s' % key,
 params=params, headers=headers)
 params=params, headers=headers, total_timeout=total_timeout)

 def _convert_wait_to_seconds(self, wait):
 unit_to_seconds_multiplier = {
 'ms': 0.001,
 's': 1,
 'm': 60
 }
 wait_digit = int(re.search(r'\d+', wait).group())
 multiplier = unit_to_seconds_multiplier[re.search(r'ms|s|m', wait).group()]

 return wait_digit * multiplier

 def put(
 self,
Expand Down

2 changes: 1 addition & 1 deletion
consul/std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ def response(response):
 response.text,
 response.content)

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return callback(self.response(
 self.session.get(uri,
Expand Down

5 changes: 3 additions & 2 deletions
consul/tornado.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,13 @@ def _request(self, callback, request):
 response = e.response
 raise gen.Return(callback(self.response(response)))

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 request = httpclient.HTTPRequest(uri,
 method='GET',
 validate_cert=self.verify,
 headers=headers)
 headers=headers,
 connect_timeout=total_timeout)
 return self._request(callback, request)

 def put(self, callback, path, params=None, data='', headers=None):
Expand Down

5 changes: 3 additions & 2 deletions
consul/twisted.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,14 @@ def request(self, callback, method, url, **kwargs):
 'Request incomplete: {} {}'.format(method.upper(), url))

 @inlineCallbacks
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 response = yield self.request(callback,
 'get',
 uri,
 params=params,
 headers=headers)
 headers=headers,
 total_timeout=total_timeout)
 returnValue(response)

 @inlineCallbacks
Expand Down

14 changes: 7 additions & 7 deletions
tests/test_base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,22 +11,22 @@
Response = consul.base.Response

Request = collections.namedtuple(
 'Request', ['method', 'path', 'params', 'data', 'headers'])
 'Request', ['method', 'path', 'params', 'data', 'headers', 'total_timeout'])


class HTTPClient(object):
 def __init__(self, host=None, port=None, scheme=None,
 verify=True, cert=None, timeout=None, headers=None):
 pass

 def get(self, callback, path, params=None, headers=None):
 return Request('get', path, params, None, headers)
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('get', path, params, None, headers, total_timeout)

 def put(self, callback, path, params=None, data='', headers=None):
 return Request('put', path, params, data, headers)
 def put(self, callback, path, params=None, data='', headers=None, total_timeout=None):
 return Request('put', path, params, data, headers, total_timeout)

 def delete(self, callback, path, params=None, headers=None):
 return Request('delete', path, params, None, headers)
 def delete(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('delete', path, params, None, headers, total_timeout)


class Consul(consul.base.Consul):
Expand Down

48 changes: 46 additions & 2 deletions
tests/test_std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,13 +31,57 @@ def test_kv(self, consul_port):
 index, data = c.kv.get('foo')
 assert data['Value'] == six.b('bar')

 def test_kv_wait(self, consul_port):
 def test_kv_wait_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_wait_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20s', total_timeout=30)
 assert index == check

 def test_kv_wait_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='1m', total_timeout=61)
 assert index == check

 def test_kv_wait_more_timeout_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20ms', total_timeout=0
 )

 def test_kv_wait_more_timeout_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20s', total_timeout=19
 )

 def test_kv_wait_more_timeout_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='1m', total_timeout=59
 )

 def test_kv_encoding(self, consul_port):
 c = consul.Consul(port=consul_port)

Expand Down

2 changes: 1 addition & 1 deletion
tests/test_std_token.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ def test_kv_wait(self, acl_consul):
 c = consul.Consul(port=acl_consul.port, token=acl_consul.token)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_encoding(self, acl_consul):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
HH-123895 increase request timeout#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nicholasgribanov
merged 1 commit into

from

Feb 10, 2021
 Merged


HH-123895 increase request timeout
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
consul/aio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import warnings

import aiohttp
from aiohttp import ClientTimeout

from consul import base

Expand All@@ -20,10 +21,10 @@ def __init__(self, *args, loop=None, **kwargs):
 self._session = None
 self._loop = loop or asyncio.get_event_loop()

 async def _request(self, callback, method, uri, data=None, headers=None):
 async def _request(self, callback, method, uri, data=None, headers=None, total_timeout=None):
 connector = aiohttp.TCPConnector(loop=self._loop,
 verify_ssl=self.verify)
 async with aiohttp.ClientSession(connector=connector) as session:
 async with aiohttp.ClientSession(connector=connector, timeout=ClientTimeout(total=total_timeout)) as session:
 self._session = session
 resp = await session.request(method=method,
 url=uri,
Expand All@@ -47,9 +48,9 @@ def __del__(self):
 ResourceWarning)
 asyncio.ensure_future(self.close())

 async def get(self, callback, path, params=None, headers=None):
 async def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return await self._request(callback, 'GET', uri, headers=headers)
 return await self._request(callback, 'GET', uri, headers=headers, total_timeout=total_timeout)

 async def put(self, callback, path, params=None, data='', headers=None):
 uri = self.uri(path, params)
Expand Down

23 changes: 20 additions & 3 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import json
import logging
import os
import re
import warnings

import six
Expand DownExpand Up@@ -316,7 +317,7 @@ def uri(self, path, params=None):
 return uri

 @abc.abstractmethod
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 raise NotImplementedError

 @abc.abstractmethod
Expand DownExpand Up@@ -2955,7 +2956,8 @@ def get(
 consistency=None,
 keys=False,
 separator=None,
 dc=None):
 dc=None,
 total_timeout=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3002,6 +3004,10 @@ def get(
 if index:
 params.append(('index', index))
 if wait:
 assert total_timeout, \
 'total_timeout should be setted'
 assert not self._convert_wait_to_seconds(wait) >= total_timeout, \
 f'wait: {wait} should be less than total_timeout: {total_timeout}s'
 params.append(('wait', wait))
 if recurse:
 params.append(('recurse', '1'))
Expand DownExpand Up@@ -3030,7 +3036,18 @@ def get(
 CB.json(index=True, decode=decode, one=one,
 map=lambda x: x if x else None),
 path='/v1/kv/%s' % key,
 params=params, headers=headers)
 params=params, headers=headers, total_timeout=total_timeout)

 def _convert_wait_to_seconds(self, wait):
 unit_to_seconds_multiplier = {
 'ms': 0.001,
 's': 1,
 'm': 60
 }
 wait_digit = int(re.search(r'\d+', wait).group())
 multiplier = unit_to_seconds_multiplier[re.search(r'ms|s|m', wait).group()]

 return wait_digit * multiplier

 def put(
 self,
Expand Down

2 changes: 1 addition & 1 deletion
consul/std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ def response(response):
 response.text,
 response.content)

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 return callback(self.response(
 self.session.get(uri,
Expand Down

5 changes: 3 additions & 2 deletions
consul/tornado.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,13 @@ def _request(self, callback, request):
 response = e.response
 raise gen.Return(callback(self.response(response)))

 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 request = httpclient.HTTPRequest(uri,
 method='GET',
 validate_cert=self.verify,
 headers=headers)
 headers=headers,
 connect_timeout=total_timeout)
 return self._request(callback, request)

 def put(self, callback, path, params=None, data='', headers=None):
Expand Down

5 changes: 3 additions & 2 deletions
consul/twisted.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,13 +100,14 @@ def request(self, callback, method, url, **kwargs):
 'Request incomplete: {} {}'.format(method.upper(), url))

 @inlineCallbacks
 def get(self, callback, path, params=None, headers=None):
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 uri = self.uri(path, params)
 response = yield self.request(callback,
 'get',
 uri,
 params=params,
 headers=headers)
 headers=headers,
 total_timeout=total_timeout)
 returnValue(response)

 @inlineCallbacks
Expand Down

14 changes: 7 additions & 7 deletions
tests/test_base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,22 +11,22 @@
Response = consul.base.Response

Request = collections.namedtuple(
 'Request', ['method', 'path', 'params', 'data', 'headers'])
 'Request', ['method', 'path', 'params', 'data', 'headers', 'total_timeout'])


class HTTPClient(object):
 def __init__(self, host=None, port=None, scheme=None,
 verify=True, cert=None, timeout=None, headers=None):
 pass

 def get(self, callback, path, params=None, headers=None):
 return Request('get', path, params, None, headers)
 def get(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('get', path, params, None, headers, total_timeout)

 def put(self, callback, path, params=None, data='', headers=None):
 return Request('put', path, params, data, headers)
 def put(self, callback, path, params=None, data='', headers=None, total_timeout=None):
 return Request('put', path, params, data, headers, total_timeout)

 def delete(self, callback, path, params=None, headers=None):
 return Request('delete', path, params, None, headers)
 def delete(self, callback, path, params=None, headers=None, total_timeout=None):
 return Request('delete', path, params, None, headers, total_timeout)


class Consul(consul.base.Consul):
Expand Down

48 changes: 46 additions & 2 deletions
tests/test_std.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,13 +31,57 @@ def test_kv(self, consul_port):
 index, data = c.kv.get('foo')
 assert data['Value'] == six.b('bar')

 def test_kv_wait(self, consul_port):
 def test_kv_wait_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_wait_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20s', total_timeout=30)
 assert index == check

 def test_kv_wait_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='1m', total_timeout=61)
 assert index == check

 def test_kv_wait_more_timeout_ms(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20ms', total_timeout=0
 )

 def test_kv_wait_more_timeout_s(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='20s', total_timeout=19
 )

 def test_kv_wait_more_timeout_m(self, consul_port):
 c = consul.Consul(port=consul_port)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 pytest.raises(
 AssertionError,
 c.kv.get,
 'foo', index=index, wait='1m', total_timeout=59
 )

 def test_kv_encoding(self, consul_port):
 c = consul.Consul(port=consul_port)

Expand Down

2 changes: 1 addition & 1 deletion
tests/test_std_token.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ def test_kv_wait(self, acl_consul):
 c = consul.Consul(port=acl_consul.port, token=acl_consul.token)
 assert c.kv.put('foo', 'bar') is True
 index, data = c.kv.get('foo')
 check, data = c.kv.get('foo', index=index, wait='20ms')
 check, data = c.kv.get('foo', index=index, wait='20ms', total_timeout=30)
 assert index == check

 def test_kv_encoding(self, acl_consul):
Expand Down