Changeset 1021

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

Files:

• bin/repykota (modified) (2 diffs)
• conf/pykota.conf.sample (modified) (3 diffs)
• docs/installation.sgml (modified) (4 diffs)
• initscripts/postgresql/pykota-postgresql.sql (modified) (3 diffs)
• NEWS (modified) (1 diff)
• pykota/config.py (modified) (3 diffs)
• pykota/logger.py (modified) (2 diffs)
• pykota/storage.py (modified) (4 diffs)
• pykota/storages/ldapstorage.py (modified) (5 diffs)
• pykota/storages/pgstorage.py (added)
• pykota/storages/postgresql.py (deleted)
• pykota/storages/sql.py (deleted)
• pykota/tool.py (modified) (3 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/repykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.37  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.36  2003/06/06 14:21:08  jalet
 # New LDAP schema.
@@ -291 +297 @@
         
         # Initializes the command line tool
-        reporter = RePyKota(asadmin=0, doc=__doc__)
+        reporter = RePyKota(doc=__doc__)
         
         # parse and checks the command line

pykota/trunk/conf/pykota.conf.sample

@@ -26 +26 @@
 [global]
 # Storage backend for quotas
-# only PostgreSQL is supported
+# only PGStorage (PostgreSQL) is supported
 # Ldap, MySQL, Berkeley are planned
-storagebackend: postgresql
+
+# the 'postgresql' value is deprecated, use 'pgstorage' instead.
+storagebackend: pgstorage
 
 # Quota Storage Server hostname (and optional port)
@@ -40 +42 @@
 # Quota Storage administrator's and normal user's names and passwords
 storageadmin: pykotaadmin
-storageuser: pykotauser
 # storageadminpw: Comment out if unused, or set to Quota Storage admin password
-# storageuserpw: Comment out if unused, or set to Quota Storage user password
+
+# NB : storageuser and storageuserpw are not used anymore
 
 # LDAP example :
@@ -57 +59 @@
 # if the value is not set then the default SYSTEM applies.
 logger: system
+
+# Enable debugging ? Put YES instead here.
+debug : No
 
 # Mail server to use to warn users

pykota/trunk/docs/installation.sgml

@@ -131 +131 @@
         To do so, you'll have to feed <application>PostgreSQL</application> with the
         <filename>pykota-x.xx/initscripts/postgresql/pykota-postgresql.sql</filename> file.
-        This file will create a Quota DataBase administrator and a Quota DataBase user
-        in the <application>PostgreSQL</application> system, then create an empty
+        This file will create a Quota DataBase administrator in the <application>PostgreSQL</application> system, then create an empty
         Quota DataBase and set some permissions on it. The Quota DataBase administrator
-        will be able to add printers, users and groups to the Quota DataBase, while
-        the Quota DataBase user will be used to update the print quota usage
-        in the Quota DataBase. None of these two users is present in the Quota Database
-        itself, they are only defined in <application>PostgreSQL</application> and don't
-        have to exist on any system, nor in the Quota DataBase. Their default names
-        are <literal>pykotaadmin</literal> for the administrator and <literal>pykotauser</literal>
-        for the user. The database which will be created will be named <literal>pykota</literal>.
+        is the <application>PostgreSQL</application>'s user used to manage the Quota database.
+        The Quota DataBase Administrator is not present in the Quota Database
+        itself, he is only defined in <application>PostgreSQL</application> and don't
+        have to exist on any system, nor in the Quota DataBase. His default names
+        is <literal>pykotaadmin</literal>. 
+        The database which will be created will be named <literal>pykota</literal> by default.
         <note>
           <title>Note</title>
@@ -179 +177 @@
         For security reasons, you may want to set passwords in 
         <application>PostgreSQL</application> for the 
-        <literal>pykotaadmin</literal> and <literal>pykotauser</literal> 
-        users. Otherwise any user able to connect to 
+        <literal>pykotaadmin</literal> user.
+        Otherwise any user able to connect to 
         <application>PostgreSQL</application> on your Quota Storage Server 
-        could connect to the quota database as one of them and modify it without problem. 
+        could connect to the quota database as this user, and modify it without problem. 
       </para>
       
       <para>
         To do so, just type the following lines while still being at the <application>psql</application>
-        prompt (replace the passwords values by your own) :
+        prompt (replace the password values by your own) :
         <screen>
 pykota=# ALTER USER pykotaadmin PASSWORD 'somepassword';
-ALTER USER
-pykota=# ALTER USER pykotauser PASSWORD 'anotherpassword';
 ALTER USER
 pykota=# \q
@@ -253 +249 @@
       
       <para>
-        An <application>LDAP</application> Storage Backend is planned, but it actually
-        doesn't exist. Some people may already be working on this, though. 
+        An <application>LDAP</application> Storage Backend is currently under heavy work.
+        You can already give a look at the LDAP schema which was defined for PyKota.
+        Full support for LDAP in PyKota should be OK by the end of July 2003, if all
+        continues to go well.
       </para>
     </sect2>  
@@ -374 +372 @@
 
 $Log$
+Revision 1.15  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.14  2003/06/05 07:12:29  jalet
 Reorganization of directories

pykota/trunk/initscripts/postgresql/pykota-postgresql.sql

@@ -20 +20 @@
 --
 -- $Log$
+-- Revision 1.2  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.1  2003/06/05 07:12:31  jalet
 -- Reorganization of directories
@@ -41 +47 @@
 -- Create the print quota database users
 -- 
-CREATE USER pykotauser;
 CREATE USER pykotaadmin;
 
@@ -120 +125 @@
 GRANT SELECT, INSERT, UPDATE, DELETE, REFERENCES ON users, groups, printers, userpquota, grouppquota, groupsmembers, jobhistory TO pykotaadmin;
 GRANT SELECT, UPDATE ON users_id_seq, groups_id_seq, printers_id_seq, userpquota_id_seq, grouppquota_id_seq, jobhistory_id_seq TO pykotaadmin;
-GRANT SELECT, UPDATE ON printers, userpquota, grouppquota TO pykotauser;
-GRANT SELECT ON users, groups, groupsmembers TO pykotauser;
-GRANT SELECT, INSERT, UPDATE ON jobhistory TO pykotauser;
-GRANT SELECT, UPDATE ON jobhistory_id_seq TO pykotauser;
 

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.08alpha8 :
+    
+        - Code refactoring.
+        - A single user/password pair is used to connect
+          to the database backend. The storageuser configuration
+          field, and its associated passwords storageuserpw, are 
+          not used anymore.
+        
     - 1.08alpha7 :
     

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."""