github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-29 08:48:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Get a fresh sys.path when loading plugins.

Browse Source 
This means that we don't need to kill the WSGI server master process to
load new plugins anymore.
This commit is contained in:
Neil Williams
2013-05-31 20:40:16 -07:00
parent 3276e408b4
commit 1fe74b4c36
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
r2/r2/lib/plugin.py
View File

@@ -20,6 +20,7 @@
# Inc. All Rights Reserved.
###############################################################################
import site
import sys
import os.path
import pkg_resources
@@ -83,6 +84,14 @@ class Plugin(object):
class PluginLoader(object):
def __init__(self, plugin_names=None):
# reloading site ensures that we have a fresh sys.path to build our
# working set off of. this means that forked worker processes won't get
# the sys.path that was current when the master process was spawned
# meaning that new plugins will be picked up on regular app reload
# rather than having to restart the master process as well.
reload(site)
self.working_set = pkg_resources.WorkingSet(sys.path)
if plugin_names is None:
entry_points = self.available_plugins()
else:
@@ -123,9 +132,8 @@ class PluginLoader(object):
def __getitem__(self, key):
return self.plugins[key]
@staticmethod
def available_plugins(name=None):
return pkg_resources.iter_entry_points('r2.plugin', name)
def available_plugins(self, name=None):
return self.working_set.iter_entry_points('r2.plugin', name)
def declare_queues(self, queues):
for plugin in self: