pld-builder.new: PLD_Builder/acl.py, PLD_Builder/request_fetcher.py, PLD_Bu...

[arekm]

Author: arekm                        Date: Wed Jun  2 18:03:28 2010 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Try to reload acl.conf on change.

---- Files affected:
pld-builder.new/PLD_Builder:
   acl.py (1.24 -> 1.25) , request_fetcher.py (1.28 -> 1.29) , request_handler.py (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/acl.py
diff -u pld-builder.new/PLD_Builder/acl.py:1.24 pld-builder.new/PLD_Builder/acl.py:1.25
--- pld-builder.new/PLD_Builder/acl.py:1.24	Fri Jun 27 20:04:53 2008
+++ pld-builder.new/PLD_Builder/acl.py	Wed Jun  2 20:03:23 2010
@@ -3,6 +3,7 @@
 import ConfigParser
 import string
 import fnmatch
+import os
 
 import path
 import log
@@ -83,8 +84,21 @@
     def get_login(self):
         return self.login
 
-class ACL_Conf:
+class ACL_Conf():
     def __init__(self):
+        self.acl_conf_mtime = 0
+        self.reload()
+
+    def try_reload(self):
+        mtime = os.stat(path.acl_conf)[ST_MTIME]
+        if mtime != self.acl_conf_mtime:
+            log.notice("acl.conf has changed, reloading...")
+            self.reload()
+            self.acl_conf_mtime = mtime
+            return True
+        return False
+
+    def reload(self):
         self.current_user = None
         status.push("reading acl.conf")
         p = ConfigParser.ConfigParser()

================================================================
Index: pld-builder.new/PLD_Builder/request_fetcher.py
diff -u pld-builder.new/PLD_Builder/request_fetcher.py:1.28 pld-builder.new/PLD_Builder/request_fetcher.py:1.29
--- pld-builder.new/PLD_Builder/request_fetcher.py:1.28	Tue Sep  1 11:28:44 2009
+++ pld-builder.new/PLD_Builder/request_fetcher.py	Wed Jun  2 20:03:23 2010
@@ -109,6 +109,7 @@
     if lck == None:
         sys.exit(1)
     init_conf()
+    acl.try_reload()
     
     status.push("fetching requests")
     if has_new(config.control_url):

================================================================
Index: pld-builder.new/PLD_Builder/request_handler.py
diff -u pld-builder.new/PLD_Builder/request_handler.py:1.51 pld-builder.new/PLD_Builder/request_handler.py:1.52
--- pld-builder.new/PLD_Builder/request_handler.py:1.51	Mon Feb  8 21:36:34 2010
+++ pld-builder.new/PLD_Builder/request_handler.py	Wed Jun  2 20:03:23 2010
@@ -192,6 +192,7 @@
     return True
 
 def handle_request_main(req, filename = None):
+    acl.try_reload()
     init_conf("src")
     status.push("handling email request")
     ret = handle_request(req, filename = filename)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/acl.py?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request_fetcher.py?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request_handler.py?r1=1.51&r2=1.52&f=u