openstack
/
freezer
Code Issues Proposed changes

Merge "Modify a few exceptions in ftp.py"

This commit is contained in:
Zuul 2018-12-19 07:52:38 +00:00 committed by Gerrit Code Review
parent 9d1dd59a8f 931e2a6926
commit 36439ceab8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freezer/storage/ftp.py
View File

@ -290,7 +290,7 @@ class FtpStorage(BaseFtpStorage):
LOG.info("ftp nlst result=%s" % nfiles)
except socket.error as e:
LOG.info("ftp socket error=%s" % e)
self.ftp.set_pasv(False)
ftp.set_pasv(False)
except ftplib.all_errors as e: # socket.error
msg = "create ftp failed error=%s" % e
LOG.info(msg)
@ -333,7 +333,7 @@ class FtpsStorage(BaseFtpStorage):
LOG.info("ftps nlst result=%s" % nfiles)
except socket.error as e:
LOG.info("ftps socket error=%s" % e)
self.ftp.set_pasv(False)
ftps.set_pasv(False)
except ftplib.all_errors as e:
msg = "create ftps failed error=%s" % e
LOG.info(msg)