X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=python%2Fcumulus%2Fstore%2Fftp.py;h=ba2e4e75686544250b9f46d97c1ce7b14974c797;hb=a5f66616b1ec0c38328ad5131bf1c889ccc43659;hp=52a7aadcad105c79fd65909a28836a0165de9afe;hpb=65edb87a0b8a578b4a7221478a851d71df21fab0;p=cumulus.git

diff --git a/python/cumulus/store/ftp.py b/python/cumulus/store/ftp.py
index 52a7aad..ba2e4e7 100644
--- a/python/cumulus/store/ftp.py
+++ b/python/cumulus/store/ftp.py
@@ -1,5 +1,22 @@
+# Cumulus: Efficient Filesystem Backup to the Cloud
+# Copyright (C) 2009 The Cumulus Developers
+# See the AUTHORS file for a list of contributors.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from ftplib        import FTP, all_errors
+from ftplib        import FTP, all_errors, error_temp
 from netrc         import netrc, NetrcParseError
 from cumulus.store import Store, type_patterns, NotFoundError
 
@@ -30,16 +47,24 @@ class FtpStore (Store):
                     pass
             except (IOError, NetrcParseError):
                 pass
-        self.ftp = FTP ()
-        self.ftp.connect (host, port)
-        self.ftp.login (user, passwd)
+        self.host   = host
+        self.port   = port
+        self.user   = user
+        self.passwd = passwd
         self.prefix = self.path [1:] # skip *only* first '/'
-        self.ftp.cwd (self.prefix)
+        self.ftp    = FTP ()
+        self.connect ()
 
     def _get_path (self, type, name):
         # we are in right directory
         return name
 
+    def connect (self) :
+        self.ftp.connect (self.host, self.port)
+        self.ftp.login (self.user, self.passwd)
+        self.ftp.cwd (self.prefix)
+    # end def connect
+
     def list (self, type):
         self.sync ()
         files = self.ftp.nlst ()
@@ -47,6 +72,7 @@ class FtpStore (Store):
 
     def get (self, type, name):
         self.sync ()
+        self.ftp.sendcmd ('TYPE I')
         sock = self.ftp.transfercmd ('RETR %s' % self._get_path (type, name))
         self.synced = False
         return sock.makefile ()
@@ -72,23 +98,32 @@ class FtpStore (Store):
             self.ftp.sendcmd ('TYPE I')
             size = self.ftp.size (fn)
             self.ftp.sendcmd ('TYPE A')
-        except all_errors, err:
-            print err
+        except all_errors as err:
+            print(err)
             pass
         if size is not None:
             return {'size': size}
-        print "nlst: %s" % fn, size
+        print("nlst: %s" % fn, size)
         l = self.ftp.nlst (fn)
         if l:
             return {'size': 42}
-        raise NotFoundError, (type, name)
+        raise NotFoundError(type, name)
 
     def sync (self):
         """ After a get command at end of transfer a 2XX reply is still
-        in the input-queue, we have to get rid of that
+        in the input-queue, we have to get rid of that.
+        We also test here that the connection is still alive. If we get
+        a temporary error 421 ("error_temp") we reconnect: It was
+        probably a timeout.
         """
-        if not self.synced:
-            self.ftp.voidresp()
+        try :
+            if not self.synced:
+                self.ftp.voidresp()
+            self.ftp.sendcmd ('TYPE A')
+        except error_temp as err :
+            if not err.message.startswith ('421') :
+                raise
+            self.connect ()
         self.synced = True
 
 Store = FtpStore