openstack
/
python-tripleoclient
Code Issues Proposed changes

Close session objects in container_image.py 

We don't seem to close the request session objects we create,
after using them and this results in unclosed sockets and
the warning.

ResourceWarning: unclosed <socket.socket fd=17...

Change-Id: Ida92643820e04563cc5ea75788a07d73955efe9e
(cherry picked from commit b407f78a84)
This commit is contained in:
Rabi Mishra 2020-07-23 12:00:40 +05:30
parent 87aa47cab3
commit 3d5bd5a007
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tripleoclient/v1/container_image.py
View File

@ -679,9 +679,9 @@ class TripleOContainerImagePush(command.Command):
registry_url = registry_url_arg
reg_url = parse.urlparse(registry_url)
uploader.authenticate(reg_url,
parsed_args.username,
parsed_args.password)
session = uploader.authenticate(reg_url,
parsed_args.username,
parsed_args.password)
task = image_uploader.UploadTask(
image_name=image_name,
@ -701,6 +701,8 @@ class TripleOContainerImagePush(command.Command):
self.log.error("Unable to upload due to permissions. "
"Please prefix command with sudo.")
raise oscexc.CommandError(e)
finally:
session.close()
class TripleOContainerImageDelete(command.Command):
@ -772,6 +774,8 @@ class TripleOContainerImageDelete(command.Command):
self.log.error("Unable to remove due to permissions. "
"Please prefix command with sudo.")
raise oscexc.CommandError(e)
finally:
session.close()
class TripleOContainerImageList(command.Lister):
@ -816,7 +820,11 @@ class TripleOContainerImageList(command.Lister):
url = uploader._image_to_url(registry_url_arg)
session = uploader.authenticate(url, parsed_args.username,
parsed_args.password)
results = uploader.list(url.geturl(), session=session)
try:
results = uploader.list(url.geturl(), session=session)
finally:
session.close()
cliff_results = []
for r in results:
cliff_results.append((r,))
@ -866,9 +874,12 @@ class TripleOContainerImageShow(command.ShowOne):
url = uploader._image_to_url(parsed_args.image_to_inspect)
session = uploader.authenticate(url, parsed_args.username,
parsed_args.password)
image_inspect_result = uploader.inspect(parsed_args.image_to_inspect,
session=session)
try:
image_inspect_result = uploader.inspect(
parsed_args.image_to_inspect,
session=session)
finally:
session.close()
return self.format_image_inspect(image_inspect_result)