Changeset 780

Timestamp:

Jul 25, 2009, 2:19:24 AM (15 years ago)

Author:

joergs

Message:

improved logging

File:

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

baculafs/trunk/baculafs.py

@@ -16 +16 @@
 
 LOG_FILENAME        = '/tmp/baculafs.log'
-LOG_BCONSOLE        = '/tmp/bconsole.log'
+#LOG_BCONSOLE        = '/tmp/bconsole.log'
 LOG_BCONSOLE_DUMP   = '/tmp/bconsole.out'
 
@@ -33 +33 @@
 class Bconsole:
 
-    #bconsole = None
-
     def __init__(self, client=BACULA_CLIENT):
-        #logging.basicConfig(filename=LOG_BCONSOLE,level=logging.DEBUG,)
-        logging.debug('BC init')
+        #logging.debug('BC init')
         self.bconsole = pexpect.spawn( BACULA_CMD, logfile=file(LOG_BCONSOLE_DUMP, 'w'), timeout=10 )
         self.bconsole.setecho( False )
@@ -47 +44 @@
         self.bconsole.sendline( BACULA_CLIENT )
         self.bconsole.expect( BCONSOLE_RESTORE_PROMPT )
-        logging.debug( "BC alive: " + str(self.bconsole.isalive()) )
-        logging.debug('BC init done')
+        #logging.debug( "BC alive: " + str(self.bconsole.isalive()) )
+        #logging.debug('BC init done')
 
 
@@ -54 +51 @@
 
         path = path + "/"
-        logging.debug( "BC ls(" + path + ")" )
+        logging.debug( "(" + path + ")" )
 
         self.bconsole.sendline( 'cd ' + path )
@@ -61 +58 @@
 
         index = self.bconsole.expect( ["cwd is: " + path + "[/]?", BCONSOLE_RESTORE_PROMPT, pexpect.EOF, pexpect.TIMEOUT ] )
-        logging.debug( "BC ls: cd result: " + str(index) )
+        logging.debug( "cd result: " + str(index) )
 
         if index == 0:
@@ -79 +76 @@
         self.bconsole.expect( BCONSOLE_RESTORE_PROMPT )
         lines = self.bconsole.before.splitlines()
-        logging.debug( "BC ls: " + str(lines) )
+        #logging.debug( str(lines) )
         return lines
 
@@ -93 +90 @@
 
     def __init__(self, *args, **kw):
-        logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,)
         logging.debug('init')
         #self.console = Bconsole()
@@ -103 +99 @@
         # TODO: may cause problems with filenames that ends with "/" 
         path = path.rstrip( '/' )
-        logging.debug( "_getdir(" + path + ")" )
+        logging.debug( '"' + path + '"' )
 
         if (path in self.files):
-            logging.debug( "  _getdir(" + path + ")=" + str(self.files[path]) )
+            #logging.debug( "(" + path + ")=" + str(self.files[path]) )
             if self.files[path]['type'] == self.TYPE_FILE:
-                logging.debug( "  type: file" )
+                logging.debug( '"' + path + '"=file (cached)' )
                 return self.files[path]
             elif ((self.files[path]['type'] == self.TYPE_DIR) and ('files' in self.files[path])):
-                logging.debug( "  type: dir (cached)" )
+                logging.debug( '"' + path + '"=dir (cached)' )
                 return self.files[path]
 
         try:
             files = Bconsole().ls(path)
-            logging.debug( "  files: " + str( files ) )
-            self.files[path] = {}
-            self.files[path]['type']  = self.TYPE_DIR
-            self.files[path]['dirs']  = [ ".", ".." ]
-            self.files[path]['files'] = []
+            #logging.debug( "  files: " + str( files ) )
+
+            # setting initial empty directory. Add entires later in this function
+            self.files[path] = { 'type': self.TYPE_DIR, 'dirs': [ ".", ".." ], 'files': [] }
             for i in files:
                 if i.endswith('/'):
@@ -133 +128 @@
                     self.files[path + "/" + i] = { 'type': self.TYPE_FILE }
 
-        except:
-            logging.debug( "Unexpected error:" + sys.exc_info()[0] )
+        except Exception as e:
+            logging.exception(e)
             logging.error( "no access to path " + path )
             self.files[path] = { 'type': TYPE_NONE }
-        logging.debug( "  " + str( self.files[path] )  )
+        logging.debug( '"' + path + '"=' + str( self.files[path] )  )
         return self.files[path]
 
@@ -144 +139 @@
     # TODO: only works after readdir for the directory (eg. ls)
     def getattr(self, path):
-        logging.debug( "getattr " + path )
 
+        # TODO: may cause problems with filenames that ends with "/" 
+        path = path.rstrip( '/' )
+        logging.debug( '"' + path + '"' )
+
+        file = self.files[path]
         st = fuse.Stat()
 
         #file = self._getdir( path )
-
-        # TODO: may cause problems with filenames that ends with "/" 
-        path = path.rstrip( '/' )
-        file = self.files[path]
 
         if file['type'] == self.TYPE_FILE:
@@ -171 +166 @@
 
     def readdir(self, path, offset):
-        logging.debug( "readdir " + path + "(offset: " + str(offset) + ")" )
+        logging.debug( '"' + path + '", offset=' + str(offset) + ')' )
 
         dir = self._getdir( path )
@@ -193 +188 @@
 
 if __name__ == "__main__":
+    # initialize logging
+    logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,format="%(asctime)s %(process)5d(%(threadName)s) %(levelname)-7s %(funcName)s( %(message)s )")
+
     fs = BaculaFS()
     fs.parse()