Ticket #3833: env_reload_5342.diff

Users/simon/dev/svn_out/trac-0.10-stable/trac/config.py

@@ -173 +173 @@
         finally:
             fileobj.close()
 
-    def parse_if_needed(self):
+    def parse_if_needed(self, check_only=False):
         # Load global configuration
+        # Alternatively, if check_only it returns True if it needs updating
         if os.path.isfile(self.site_filename):
             modtime = os.path.getmtime(self.site_filename)
             if modtime > self._lastsitemtime:
+                if check_only:
+                    return True
                 self.site_parser.read(self.site_filename)
                 self._lastsitemtime = modtime
 
@@ -185 +188 @@
             return
         modtime = os.path.getmtime(self.filename)
         if modtime > self._lastmtime:
+            if check_only:
+                return True
             self.parser.read(self.filename)
             self._lastmtime = modtime
 

Users/simon/dev/svn_out/trac-0.10-stable/trac/web/main.py

@@ -54 +54 @@
     env = None
     env_cache_lock.acquire()
     try:
-        if not env_path in env_cache:
+        if (not env_path in env_cache) or (
+                env_cache[env_path].config.parse_if_needed(check_only=True)):
             env_cache[env_path] = open_environment(env_path)
         env = env_cache[env_path]
     finally:
         env_cache_lock.release()
 
-    # Re-parse the configuration file if it changed since the last the time it
-    # was parsed
-    env.config.parse_if_needed()
-
     return env
 
 def populate_hdf(hdf, env, req=None):