Skip to content

added calls to response.close() to fix a memory leak #79

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
shiyuechengineer merged 1 commit into from
Apr 13, 2020
+29 −4
Merged

added calls to response.close() to fix a memory leak #79

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
33 changes: 29 additions & 4 deletions meraki/rest_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ def request(self, metadata, method, url, **kwargs):
while retries > 0:
# Make the HTTP request to the API endpoint
try:
if response:
response.close()
response = self._req_session.request(method, abs_url, allow_redirects=False, **kwargs)
reason = response.reason if response.reason else ''
status = response.status_code
Expand Down Expand Up @@ -190,7 +192,12 @@ def get(self, metadata, url, params=None):
metadata['url'] = url
metadata['params'] = params
response = self.request(metadata, 'GET', url, params=params)
return response.json() if response and response.text.strip() else None
ret = None
if response:
if response.text.strip():
ret = response.json()
response.close()
return ret

def get_pages(self, metadata, url, params=None, total_pages=-1, direction='next'):
if type(total_pages) == str and total_pages.lower() == 'all':
Expand All @@ -217,6 +224,9 @@ def get_pages(self, metadata, url, params=None, total_pages=-1, direction='next'
elif 'rel=last' in l:
last = l[l.find('<')+1:l.find('>')]

response.close()
response = None

# GET the subsequent page
if direction == 'next' and next:
metadata['page'] += 1
Expand All @@ -243,24 +253,39 @@ def get_pages(self, metadata, url, params=None, total_pages=-1, direction='next'

total_pages -= 1

if response:
response.close()

return results

def post(self, metadata, url, json=None):
metadata['method'] = 'POST'
metadata['url'] = url
metadata['json'] = json
response = self.request(metadata, 'POST', url, json=json)
return response.json() if response and response.text.strip() else None
ret = None
if response:
if response.text.strip():
ret = response.json()
response.close()
return ret

def put(self, metadata, url, json=None):
metadata['method'] = 'PUT'
metadata['url'] = url
metadata['json'] = json
response = self.request(metadata, 'PUT', url, json=json)
return response.json() if response and response.text.strip() else None
ret = None
if response:
if response.text.strip():
ret = response.json()
response.close()
return ret

def delete(self, metadata, url):
metadata['method'] = 'DELETE'
metadata['url'] = url
self.request(metadata, 'DELETE', url)
response = self.request(metadata, 'DELETE', url)
if response:
response.close()
return None