Changeset 1021 for pykota/trunk/pykota

Timestamp:

06/10/03 18:37:54 (21 years ago)

Author:

jalet

Message:

Deletion of the second user which is not needed anymore.
Added a debug configuration field in /etc/pykota.conf
All queries can now be sent to the logger in debug mode, this will
greatly help improve performance when time for this will come.

Location:

pykota/trunk/pykota

Files:

• config.py (modified) (3 diffs)
• logger.py (modified) (2 diffs)
• storage.py (modified) (4 diffs)
• storages/ldapstorage.py (modified) (5 diffs)
• storages/pgstorage.py (added)
• storages/postgresql.py (deleted)
• storages/sql.py (deleted)
• tool.py (modified) (3 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/config.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.28  2003/06/10 16:37:54  jalet
+# Deletion of the second user which is not needed anymore.
+# Added a debug configuration field in /etc/pykota.conf
+# All queries can now be sent to the logger in debug mode, this will
+# greatly help improve performance when time for this will come.
+#
 # Revision 1.27  2003/05/27 23:00:21  jalet
 # Big rewrite of external accounting methods.
@@ -183 +189 @@
         for option in [ "storagebackend", "storageserver", \
                         "storagename", "storageadmin", \
-                        "storageuser", \
                       ] :
             backendinfo[option] = self.getGlobalOption(option)
-        for option in [ "storageadminpw", "storageuserpw" ] :    
-            backendinfo[option] = self.getGlobalOption(option, ignore=1)
+        backendinfo["storageadminpw"] = self.getGlobalOption("storageadminpw", ignore=1)
         return backendinfo
         
@@ -304 +308 @@
         except ValueError :    
             raise PyKotaConfigError, _("Invalid grace delay %s") % gd
+            
+    def getDebug(self) :          
+        """Returns 1 if debugging is activated, else 0."""
+        debug = self.getGlobalOption("debug", ignore=1)
+        if (debug is not None) and (debug.upper().strip() in ['Y', 'YES', '1', 'ON', 'O']) :
+            return 1
+        else :    
+            return 0

pykota/trunk/pykota/logger.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.7  2003/06/10 16:37:54  jalet
+# Deletion of the second user which is not needed anymore.
+# Added a debug configuration field in /etc/pykota.conf
+# All queries can now be sent to the logger in debug mode, this will
+# greatly help improve performance when time for this will come.
+#
 # Revision 1.6  2003/04/23 22:13:57  jalet
 # Preliminary support for LPRng added BUT STILL UNTESTED.
@@ -55 +61 @@
     __str__ = __repr__
 
-def openLogger(config) :
+def openLogger(pykotatool) :
     """Returns the appropriate logger subsystem object."""
-    backend = config.getLoggingBackend()
+    backend = pykotatool.config.getLoggingBackend()
     try :
         if not backend.isalpha() :

pykota/trunk/pykota/storage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.13  2003/06/10 16:37:54  jalet
+# Deletion of the second user which is not needed anymore.
+# Added a debug configuration field in /etc/pykota.conf
+# All queries can now be sent to the logger in debug mode, this will
+# greatly help improve performance when time for this will come.
+#
 # Revision 1.12  2003/04/23 22:13:57  jalet
 # Preliminary support for LPRng added BUT STILL UNTESTED.
@@ -78 +84 @@
     __str__ = __repr__
         
-def openConnection(config, asadmin=0) :
+def openConnection(pykotatool) :
     """Returns a connection handle to the appropriate Quota Storage Database."""
-    backendinfo = config.getStorageBackend()
+    backendinfo = pykotatool.config.getStorageBackend()
     backend = backendinfo["storagebackend"]
     try :
@@ -86 +92 @@
             # don't trust user input
             raise ImportError
+        #    
+        # TODO : descending compatibility
+        # 
+        if backend == "postgresql" :
+            backend = "pgstorage"       # TODO : delete, this is for descending compatibility only
         exec "from pykota.storages import %s as storagebackend" % backend.lower()    
     except ImportError :
@@ -93 +104 @@
         database = backendinfo["storagename"]
         admin = backendinfo["storageadmin"]
-        user = backendinfo["storageuser"]
         adminpw = backendinfo["storageadminpw"]
-        userpw = backendinfo["storageuserpw"]
-        if asadmin :
-            return getattr(storagebackend, "Storage")(host, database, admin, adminpw)
-        else :    
-            return getattr(storagebackend, "Storage")(host, database, user, userpw)
+        return getattr(storagebackend, "Storage")(pykotatool, host, database, admin, adminpw)
 

pykota/trunk/pykota/storages/ldapstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.5  2003/06/10 16:37:54  jalet
+# Deletion of the second user which is not needed anymore.
+# Added a debug configuration field in /etc/pykota.conf
+# All queries can now be sent to the logger in debug mode, this will
+# greatly help improve performance when time for this will come.
+#
 # Revision 1.4  2003/06/10 10:45:32  jalet
 # Not implemented methods now raise an exception when called.
@@ -55 +61 @@
     
 class Storage :
-    def __init__(self, host, dbname, user, passwd) :
+    def __init__(self, pykotatool, host, dbname, user, passwd) :
         """Opens the LDAP connection."""
         # raise PyKotaStorageError, "Sorry, the LDAP backend for PyKota is not yet implemented !"
+        self.tool = pykotatool
+        self.debug = pykotatool.config.getDebug()
         self.closed = 1
         try :
@@ -67 +75 @@
         else :    
             self.closed = 0
+            if self.debug :
+                self.tool.logger.log_message("Database opened (host=%s, dbname=%s, user=%s)" % (host, dbname, user), "debug")
             
     def __del__(self) :        
@@ -73 +83 @@
             del self.database
             self.closed = 1
+            if self.debug :
+                self.tool.logger.log_message("Database closed.", "debug")
         
     def doSearch(self, key, fields, base="", scope=ldap.SCOPE_SUBTREE) :
@@ -78 +90 @@
         try :
             # prepends something more restrictive at the beginning of the base dn
+            if self.debug :
+                self.tool.logger.log_message("QUERY : BaseDN : %s, Scope : %s, Filter : %s, Attributes : %s" % ((base or self.basedn), scope, key, fields), "debug")
             result = self.database.search_s(base or self.basedn, scope, key, fields)
         except ldap.NO_SUCH_OBJECT :    

pykota/trunk/pykota/tool.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.40  2003/06/10 16:37:54  jalet
+# Deletion of the second user which is not needed anymore.
+# Added a debug configuration field in /etc/pykota.conf
+# All queries can now be sent to the logger in debug mode, this will
+# greatly help improve performance when time for this will come.
+#
 # Revision 1.39  2003/04/29 18:37:54  jalet
 # Pluggable accounting methods (actually doesn't support external scripts)
@@ -188 +194 @@
 class PyKotaTool :    
     """Base class for all PyKota command line tools."""
-    def __init__(self, asadmin=1, doc="PyKota %s (c) 2003 %s" % (version.__version__, version.__author__)) :
+    def __init__(self, doc="PyKota %s (c) 2003 %s" % (version.__version__, version.__author__)) :
         """Initializes the command line tool."""
         # locale stuff
@@ -200 +206 @@
         self.documentation = doc
         self.config = config.PyKotaConfig("/etc")
-        self.logger = logger.openLogger(self.config)
-        self.storage = storage.openConnection(self.config, asadmin=asadmin)
+        self.logger = logger.openLogger(self)
+        self.storage = storage.openConnection(self)
         self.smtpserver = self.config.getSMTPServer()
         

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.08alpha7_unofficial"
+__version__ = "1.08alpha8_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""