Ticket #9602: 9602.fix-autoreload-for-bad-plugins.2.diff

trac/loader.py

@@ -22 +22 @@
 import os
 import sys
 
+from trac.util.autoreload import _AUTORELOAD_EXTRA_FILES
 from trac.util.compat import set
 from trac.util.text import exception_to_unicode
 
@@ -95 +96 @@
                     env.log.error('Failed to load plugin from %s: %s',
                                   plugin_file,
                                   exception_to_unicode(e, traceback=True))
+                    # add failed plugin to the list of monitored files
+                    # in autoreload mode for development
+                    if plugin_file not in _AUTORELOAD_EXTRA_FILES:
+                        _AUTORELOAD_EXTRA_FILES.append(plugin_file)
 
     return _load_py_files
 

trac/util/autoreload.py

@@ -15 +15 @@
 import sys
 import thread
 import time
+import itertools
 
 _SLEEP_TIME = 1
+_AUTORELOAD_EXTRA_FILES = []
 
 def _reloader_thread(modification_callback):
     """When this function is run from the main thread, it will force other
@@ -27 +29 @@
     """
     mtimes = {}
     while True:
-        for filename in filter(None, [getattr(module, '__file__', None)
-                                      for module in sys.modules.values()]):
+        for filename in itertools.chain(
+            filter(None, [getattr(module, '__file__', None)
+                          for module in sys.modules.values()]),
+            _AUTORELOAD_EXTRA_FILES
+          ):
             while not os.path.isfile(filename): # Probably in an egg or zip file
                 filename = os.path.dirname(filename)
                 if not filename: