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