jyapayne/python-dockercloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from docker/global_session

Browse source 
use global sessions to handle cookies (TUT-686)
This commit is contained in:
Feng Honglin 2016-02-22 15:10:05 +01:00
commit ab87575b49
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
dockercloud/api/http.py
View file

@ -11,6 +11,26 @@ from .exceptions import ApiError, AuthError
logger = logging.getLogger("python-dockercloud") logger = logging.getLogger("python-dockercloud")
global_session = Session()
def get_session():
return global_session
def close_session():
try:
global global_session
global_session.close()
except:
pass
def new_session():
close_session()
global global_session
global_session = Session()
def send_request(method, path, inject_header=True, **kwargs): def send_request(method, path, inject_header=True, **kwargs):
json = None json = None
@ -24,17 +44,16 @@ def send_request(method, path, inject_header=True, **kwargs):
# construct headers # construct headers
headers = {'Content-Type': 'application/json', 'User-Agent': user_agent} headers = {'Content-Type': 'application/json', 'User-Agent': user_agent}
headers.update(dockercloud.auth.get_auth_header()) headers.update(dockercloud.auth.get_auth_header())
logger.info("Request: %s, %s, %s, %s" % (method, url, headers, kwargs))
# construct request # construct request
s = Session() s = get_session()
req = Request(method, url, headers=headers, **kwargs) req = Request(method, url, headers=headers, **kwargs)
# get environment proxies # get environment proxies
env_proxies = utils.get_environ_proxies(url) or {} env_proxies = utils.get_environ_proxies(url) or {}
kw_args = {'proxies': env_proxies} kw_args = {'proxies': env_proxies}
# make the request # make the request
logger.info("Request: %s, %s, %s, %s, %s" % (method, url, headers, s.cookies, kwargs))
response = s.send(req.prepare(), **kw_args) response = s.send(req.prepare(), **kw_args)
status_code = getattr(response, 'status_code', None) status_code = getattr(response, 'status_code', None)
logger.info("Response: Status %s, %s, %s" % (str(status_code), response.headers, response.text)) logger.info("Response: Status %s, %s, %s" % (str(status_code), response.headers, response.text))