Changeset 1333

Timestamp:

27/07/06 11:56:03 (15 years ago)

Author:

spascoe

Message:

Moved python logging code into pybbftp.server

Location:

TI05-delivery/trunk

Files:

• lib/python/pybbftp/server.py (modified) (3 diffs)
• test/test_embedded.py (modified) (12 diffs)

TI05-delivery/trunk/lib/python/pybbftp/server.py

@@ -56 +56 @@
     
 
+# Import all LOG_* levels from syslog.
+import syslog
+for x in dir(syslog):
+    if x[:4] == 'LOG_':
+        globals()[x] = getattr(syslog, x)
+
 #--------------------------------------------------------------------------------------------------------------
 
@@ -135 +141 @@
         raise NotImplementedError
 
+    def log(self, priority, msg):
+        """Send a message to the bbftpd logger.
+
+        @param priority one of server.LOG_*
+        @param msg the message to log
+        """
+        bbftpd.log(priority, msg)
+
 
 class AuthzHandler(object):
@@ -172 +186 @@
 
         raise NotImplementedError
-    
+
+    def log(self, priority, msg):
+        """Send a message to the bbftpd logger.
+
+        @param priority one of server.LOG_*
+        @param msg the message to log
+        """
+        bbftpd.log(priority, msg)
+
 
 #--------------------------------------------------------------------------------------------------------------

TI05-delivery/trunk/test/test_embedded.py

@@ -8 +8 @@
 
 import unittest
-import sys, os, signal, time, syslog, stat
+import sys, os, signal, time, stat
 from glob import glob
 import re, tempfile, getopt
@@ -37 +37 @@
 
         msg = self.recv()
-        self.logMessage('AuthContext received Auth message: %s' % msg)
+        self.log(server.LOG_DEBUG, 'AuthContext received Auth message: %s' % msg)
                 
         self.send(NDG_HANDSHAKE)
 
         privatestr = self.recv()
-        self.logMessage("AuthContext received privatestr: %s" % privatestr)
+        self.log(server.LOG_DEBUG, "AuthContext received privatestr: %s" % privatestr)
         
         return self.makeAuthzHandler(msg, "TestCaseUser")
@@ -49 +49 @@
         return TestAuthzHandler(msg, "TestCaseUser")
 
-    def logMessage(self, msg):
-        server.bbftpd.log(syslog.LOG_DEBUG, msg)
 
 class TestAuthzHandler(server.LiberalAuthzHandler):
@@ -74 +72 @@
 
     def authzControl(self, msgcode, transferopt, path):
-        server.bbftpd.log(syslog.LOG_DEBUG, 'TestPermAuthzHandler.authzControl: msgcode = %s' % hex(msgcode))
+        self.log(server.LOG_DEBUG, 'TestPermAuthzHandler.authzControl: msgcode = %s' % hex(msgcode))
         return self.authzPath(path)
 
@@ -86 +84 @@
         mode = stat.S_IMODE(os.stat(path)[stat.ST_MODE])
         if (mode & 0004):
-            server.bbftpd.log(syslog.LOG_DEBUG, 'TestPermAuthzHandler OK')
+            self.log(server.LOG_DEBUG, 'TestPermAuthzHandler OK')
             return True
         else:
-            server.bbftpd.log(syslog.LOG_DEBUG, 'TestPermAuthzHandler FAIL')
+            self.log(server.LOG_DEBUG, 'TestPermAuthzHandler FAIL')
             raise server.AuthorisationFailure, "TestPermAuthzHandler: no read perms"
 
@@ -98 +96 @@
 
     def setUp(self):
-        # We want to mark the beginning of this test case in syslog
-        #syslog.openlog('test_embedded.py', 0, syslog.LOG_LOCAL0)
-        #syslog.syslog(syslog.LOG_DEBUG, 'Starting TestCase')
-
         self._clearLog()
         self._startServer()
@@ -107 +101 @@
     def tearDown(self):
         self._stopServer()
-        #syslog.syslog(syslog.LOG_DEBUG, 'Ended TestCase')
-        #syslog.closelog()
 
     #----------------------------------------------------------------------------------
@@ -121 +113 @@
         os.kill(self.pid, signal.SIGTERM)
         os.waitpid(self.pid, 0)
-        #syslog.syslog(syslog.LOG_DEBUG, 'Stopping server')
 
 
@@ -148 +139 @@
         return open(logfile).read()
     
-
-    def _readSyslog(self, logfile="/var/log/bbftpd/bbftpd.log"):
-        """Get all bbftpd messages from syslog for this test case.
-
-        @note: This requires read access to the logfile
-        """
-
-        # Read the logfile into a buffer
-        log = open(logfile).readlines()
-
-        # Find the latest testcase marker
-        start_i = 0
-        for i in xrange(len(log)-1, -1, -1):
-            if re.search('test_embedded.py: Starting TestCase', log[i]):
-                start_i = i+1
-                break
-        if not start_i:
-            raise RuntimeError, "Can't find test case entry in syslog"
-
-        filtered_log = []
-        for line in log[start_i:]:
-            if re.search(r'test_bbftpd.py:|bbftpd .*:', line):
-                filtered_log.append(line)
-
-        return ''.join(filtered_log)
 
 
@@ -203 +169 @@
     def testStartup(self):
         lines = self._readLog()
-        # Give syslog time to flush it's logs.
-        time.sleep(1)
         self.assertLines(['.*Starting bbftpd'], lines)
 
@@ -264 +228 @@
         os.remove(tmp)
 
-        # Check syslog
+        # Check log
         lines = self._readLog()
         self.assertLines(['.*Authz: RETR .*/foo', '.*GET TestCaseUser .*/foo.*'], lines)
@@ -287 +251 @@
         os.remove(dest)
 
-        # Check syslog
+        # Check log
         lines = self._readLog()
         self.assertLines(['.*Authz: STORE .*/new_bar', '.*PUT TestCaseUser .*/new_bar.*'], lines)