jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-07-02 18:51:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: InotifyReloader now watches newly loaded modules

Browse Source 
Refactor reloader to share code via ReloaderBase class. InotifyReloader
now calls refresh_dirs() on each event loop timeout (~1 sec) to watch
directories for dynamically loaded modules (e.g., Django dynamic imports).

Fixes #1790
Closes #1791
This commit is contained in:
Benoit Chesneau 2026-01-23 11:05:32 +01:00
parent bbc9bba95e
commit b0d38928c8
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gunicorn/reloader.py
View File

@ -13,7 +13,7 @@ import threading
COMPILED_EXT_RE = re.compile(r'py[co]$') COMPILED_EXT_RE = re.compile(r'py[co]$')
class Reloader(threading.Thread): class ReloaderBase(threading.Thread):
def __init__(self, extra_files=None, interval=1, callback=None): def __init__(self, extra_files=None, interval=1, callback=None):
super().__init__() super().__init__()
self.daemon = True self.daemon = True
@ -35,6 +35,8 @@ class Reloader(threading.Thread):
return fnames return fnames
class Reloader(ReloaderBase):
def run(self): def run(self):
mtimes = {} mtimes = {}
while True: while True:
@ -65,25 +67,21 @@ if sys.platform.startswith('linux'):
if has_inotify: if has_inotify:
class InotifyReloader(threading.Thread): class InotifyReloader(ReloaderBase):
event_mask = (inotify.constants.IN_CREATE | inotify.constants.IN_DELETE event_mask = (inotify.constants.IN_CREATE | inotify.constants.IN_DELETE
| inotify.constants.IN_DELETE_SELF | inotify.constants.IN_MODIFY | inotify.constants.IN_DELETE_SELF | inotify.constants.IN_MODIFY
| inotify.constants.IN_MOVE_SELF | inotify.constants.IN_MOVED_FROM | inotify.constants.IN_MOVE_SELF | inotify.constants.IN_MOVED_FROM
| inotify.constants.IN_MOVED_TO) | inotify.constants.IN_MOVED_TO)
def __init__(self, extra_files=None, callback=None): def __init__(self, extra_files=None, callback=None):
super().__init__() super().__init__(extra_files=extra_files, callback=callback)
self.daemon = True
self._callback = callback
self._dirs = set() self._dirs = set()
self._watcher = Inotify() self._watcher = Inotify()
for extra_file in extra_files:
self.add_extra_file(extra_file)
def add_extra_file(self, filename): def add_extra_file(self, filename):
dirname = os.path.dirname(filename) super().add_extra_file(filename)
dirname = os.path.dirname(filename)
if dirname in self._dirs: if dirname in self._dirs:
return return
@ -91,23 +89,22 @@ if has_inotify:
self._dirs.add(dirname) self._dirs.add(dirname)
def get_dirs(self): def get_dirs(self):
fnames = [ dirnames = [os.path.dirname(os.path.abspath(fname)) for fname in self.get_files()]
os.path.dirname(os.path.abspath(COMPILED_EXT_RE.sub('py', module.__file__))) return set(dirnames)
for module in tuple(sys.modules.values())
if getattr(module, '__file__', None)
]
return set(fnames) def refresh_dirs(self):
new_dirs = self.get_dirs().difference(self._dirs)
self._dirs.update(new_dirs)
for new_dir in new_dirs:
if os.path.isdir(new_dir):
self._watcher.add_watch(new_dir, mask=self.event_mask)
def run(self): def run(self):
self._dirs = self.get_dirs() self.refresh_dirs()
for dirname in self._dirs:
if os.path.isdir(dirname):
self._watcher.add_watch(dirname, mask=self.event_mask)
for event in self._watcher.event_gen(): for event in self._watcher.event_gen():
if event is None: if event is None:
self.refresh_dirs()
continue continue
filename = event[3] filename = event[3]