Ticket #3833: env_reset.3.osimons.diff

trac/env.py

@@ -329 +329 @@
                      .replace('%(path)s', self.path) \
                      .replace('%(basename)s', os.path.basename(self.path)) \
                      .replace('%(project)s', self.project_name)
-        self.log = logger_factory(logtype, logfile, self.log_level, self.path,
-                                  format=format)
+        self.log, self._log_hdlr = logger_factory(logtype, logfile,
+                            self.log_level, self.path, format=format)
 
     def get_known_users(self, cnx=None):
         """Generator that yields information about all known users, i.e. users
@@ -516 +516 @@
         env_cache_lock.acquire()
         try:
             env = env_cache.get(env_path)
+            if env and env.config.parse_if_needed():
+                # The environment is dirty - shut it down and remove from cache
+                env.shutdown()
+                env.log.removeHandler(env._log_hdlr)
+                env_cache.pop(env_path)
+                env = None
             if env is None:
                 env = env_cache.setdefault(env_path, open_environment(env_path))
-            else:
-                # Re-parse the configuration file if it changed since the last
-                # the time it was parsed
-                env.config.parse_if_needed()
         finally:
             env_cache_lock.release()
     else:

trac/admin/web_ui.py

@@ -381 +381 @@
                 self._do_update(req)
             anchor = ''
             if req.args.has_key('plugin'):
-                anchor = '#no' + req.args.get('plugin')
+                anchor = '#no%d' % (int(req.args.get('plugin')) + 1)
             req.redirect(req.href.admin(cat, page) + anchor)
 
         return self._render_view(req)
@@ -426 +426 @@
 
         # TODO: Validate that the uploaded file is actually a valid Trac plugin
 
+        # Make the environment reset itself on the next request
+        self.env.config.touch()
+
     def _do_uninstall(self, req):
         """Uninstall a plugin."""
         plugin_filename = req.args.get('plugin_filename')
@@ -437 +440 @@
         self.log.info('Uninstalling plugin %s', plugin_filename)
         os.remove(plugin_path)
 
+        # Make the environment reset itself on the next request
+        self.env.config.touch()
+
     def _do_update(self, req):
         """Update component enablement."""
         components = req.args.getlist('component')

trac/config.py

@@ -174 +174 @@
             fileobj.close()
 
     def parse_if_needed(self):
-        # Load global configuration
         if not self.filename or not os.path.isfile(self.filename):
-            return
+            return False
+
+        changed = False
         modtime = os.path.getmtime(self.filename)
         if modtime > self._lastmtime:
+            self.parser._sections = {}
             self.parser.read(self.filename)
             self._lastmtime = modtime
+            changed = True
 
         if self.parser.has_option('inherit', 'file'):
             filename = self.parser.get('inherit', 'file')
@@ -189 +192 @@
                                         filename)
             if not self.parent or self.parent.filename != filename:
                 self.parent = Configuration(filename)
+                changed = True
             else:
-                self.parent.parse_if_needed()
+                changed |= self.parent.parse_if_needed()
         elif self.parent:
+            changed = True
             self.parent = None
 
+        return changed
 
+    def touch(self):
+        os.utime(self.filename, None)
+
+
 class Section(object):
     """Proxy for a specific configuration section.
     
@@ -292 +302 @@
         """
         if self.config.parser.has_option(self.name, name):
             path = self.config.parser.get(self.name, name)
-            if path and not os.path.isabs(path):
+            if not path:
+                return default
+            if not os.path.isabs(path):
                 path = os.path.join(os.path.dirname(self.config.filename),
                                     path)
             return os.path.normcase(os.path.realpath(path))

trac/tests/env.py

@@ -1 +1 @@
 from trac import db_default
+from trac.db import sqlite_backend
 from trac.env import Environment
 
 import os.path

trac/log.py

@@ -44 +44 @@
             format = '%(asctime)s ' + format
     datefmt = ''
     if logtype == 'stderr':
-        datefmt = '%X'        
+        datefmt = '%X'
     level = level.upper()
     if level in ('DEBUG', 'ALL'):
         logger.setLevel(logging.DEBUG)
@@ -60 +60 @@
     hdlr.setFormatter(formatter)
     logger.addHandler(hdlr) 
 
-    return logger
+    return logger, hdlr

trac/util/__init__.py

@@ -228 +228 @@
         pkginfo = email.message_from_string(dist.get_metadata('PKG-INFO'))
         for attr in [key for key in attrs if key in pkginfo]:
             info[normalize(attr)] = pkginfo[attr]
+    except IOError, e:
+        err = 'Failed to read PKG-INFO file for %s: %s' % (dist, e)
+        for attr in attrs:
+            info[normalize(attr)] = err
     except email.Errors.MessageError, e:
         err = 'Failed to parse PKG-INFO file for %s: %s' % (dist, e)
         for attr in attrs: