Changeset 1148 for baculafs/trunk/baculafs.py

Timestamp:

May 22, 2013, 12:45:35 PM (11 years ago)

Author:

joergs

Message:

various improvements

File:

• baculafs/trunk/baculafs.py (modified) (5 diffs)

baculafs/trunk/baculafs.py

@@ -43 +43 @@
 class Bconsole:
 
-    def __init__(self):
+    def __init__(self, timeout = 300):
         #logging.debug('BC init')
 
+        self.timeout = timeout
         self.cwd = "/"
         self.state = BconsoleState.UNKNOWN
         self.last_items_dict = {}
 
-        self.bconsole = pexpect.spawn( BACULA_CMD, logfile=file(LOG_BCONSOLE_DUMP, 'w'), timeout=10 )
+        self.bconsole = pexpect.spawn( BACULA_CMD, logfile=file(LOG_BCONSOLE_DUMP, 'w'), timeout=timeout )
         self.bconsole.setecho( False )
         self.bconsole.expect( BCONSOLE_CMD_PROMPT )
@@ -101 +102 @@
             logging.error( "EOF bconsole" )
         except pexpect.TIMEOUT:
-            logging.error( "TIMEOUT  bconsole" )
+            logging.error( "TIMEOUT bconsole" )
+            raise
 
         return self.state
@@ -149 +151 @@
 
     def cd_restore(self, path):
+        
+        result = False
+
         logging.debug( "(" + path + ")" )
 
@@ -155 +160 @@
         #self.bconsole.sendline( 'pwd' )
 
-        index = self.bconsole.expect( ["cwd is: " + path + "[/]?", BCONSOLE_RESTORE_PROMPT, pexpect.EOF, pexpect.TIMEOUT ] )
-        logging.debug( "cd result: " + str(index) )
-
-        if index == 0:
-            # path ok, now wait for prompt
-            self.bconsole.expect( BCONSOLE_RESTORE_PROMPT )
-            return True
-        elif index == 1:
-            #print "wrong path"
-            return False
-        elif index == 2:
+        try:
+            index = self.bconsole.expect( ["cwd is: " + path + "[/]?", BCONSOLE_RESTORE_PROMPT ] )
+            logging.debug( "cd result: " + str(index) )
+
+            if index == 0:
+                # path ok, now wait for prompt
+                self.bconsole.expect( BCONSOLE_RESTORE_PROMPT )
+                result = True
+            elif index == 1:
+                # TODO: this is even returned, if path is correct. fix this.
+                logging.warning( "wrong path" )
+            else:
+                logging.error( "unexpected result" )
+
+        except pexpect.EOF:
             logging.error( "EOF bconsole" )
-            #raise?
-            return False
-        elif index == 3:
-            logging.error( "TIMEOUT  bconsole" )
-            return False
+        except pexpect.TIMEOUT:
+            logging.error( "TIMEOUT bconsole" )
+            #raise
+
+        return result
+
 
     def ls(self, path):
@@ -296 +306 @@
                     self.files[path + "/" + i] = { 'type': self.TYPE_FILE }
 
+        except pexpect.TIMEOUT:
+            logging.error( "failed to access path " + path + " (TIMEOUT)" )
         except Exception as e:
             logging.exception(e)