Changeset 876:dc80d10de7eb

Timestamp:

2010-06-17 12:57:38 (3 months ago)

Author:

Stefan Schwarzer <sschwarzer@…>

Branch:

default

Message:

Added timeout logic for servers which don't send a response for
incomplete transfers. See ticket #51.

Files:

• _mock_ftplib.py (modified) (3 diffs)
• ftp_file.py (modified) (3 diffs)

_mock_ftplib.py

@@ -60 +60 @@
         self.file_path = path
         self.mock_file_content = mock_file_content
+        self._timeout = 60
 
     def makefile(self, mode):
@@ -66 +67 @@
     def close(self):
         pass
+
+    def gettimeout(self):
+        return self._timeout
+
+    def settimeout(self, timeout):
+        self._timeout = timeout
 
 
@@ -136 +143 @@
         #  each has a corresponding `voidresp`
         self._transfercmds = 0
+        # dummy, only for getting/setting timeout in `_FTPFile.close`
+        self.sock = MockSocket("", "")
 
     def voidcmd(self, cmd):

ftp_file.py

@@ -41 +41 @@
     requested.
     """
+
+    # set timeout in seconds when closing file connections, see ticket #51
+    _close_timeout = 5
 
     def __init__(self, host):
@@ -210 +213 @@
         if self.closed:
             return
+        # timeout value to restore, see below
+        #  statement works only before the try/finally statement,
+        #  otherwise Python raises an `UnboundLocalError`
+        old_timeout = self._session.sock.gettimeout()
         try:
             self._fo.close()
             ftp_error._try_with_ioerror(self._conn.close)
+            # set a timeout to prevent waiting until server timeout
+            #  if we have a server blocking here like in ticket #51
+            self._session.sock.settimeout(self._close_timeout)
             try:
                 ftp_error._try_with_ioerror(self._session.voidresp)
@@ -220 +230 @@
                 #  http://ftputil.sschwarzer.net/trac/ticket/17,
                 #  respectively
-                error_code = str(exception)[:3]
-                if error_code not in ("150", "426", "450", "451"):
+                exception = str(exception)
+                error_code = exception[:3]
+                if exception.splitlines()[0] != "timed out" and \
+                  error_code not in ("150", "426", "450", "451"):
                     raise
         finally:
+            # restore timeout for socket of `_FTPFile`'s `ftplib.FTP`
+            #  object in case the connection is reused later
+            self._session.sock.settimeout(old_timeout)
             # if something went wrong before, the file is probably
             #  defunct and subsequent calls to `close` won't help