Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make procpool compatible with windows and OS X.

Browse source
This commit is contained in:
lagos 2012-09-27 01:26:04 -07:00
parent b28d67534b
commit bc4783efac
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
contrib/procpools/ampoule/main.py
View file

@ -278,7 +278,8 @@ def spawnProcess(processProtocol, bootstrap, args=(), env={},
pythonpath = [] pythonpath = []
for pkg in packages: for pkg in packages:
p = os.path.split(imp.find_module(pkg)[1])[0] path, name = os.path.split(pkg)
p = os.path.split(imp.find_module(name, [path] if path else None)[1])[0]
if p.startswith(os.path.join(sys.prefix, 'lib')): if p.startswith(os.path.join(sys.prefix, 'lib')):
continue continue
pythonpath.append(p) pythonpath.append(p)

6
contrib/procpools/python_procpool_plugin.py
View file

@ -24,6 +24,7 @@ file locking clashes. Test what works with your mileage.
""" """
import os import os
import sys
from django.conf import settings from django.conf import settings
@ -85,21 +86,20 @@ def start_plugin_services(server):
apackages = ("twisted", apackages = ("twisted",
os.path.join(os.pardir, "contrib", "procpools", "ampoule"), os.path.join(os.pardir, "contrib", "procpools", "ampoule"),
os.path.join(os.pardir, "ev"), os.path.join(os.pardir, "ev"),
os.path.join(os.pardir)) "settings")
aenv = {"DJANGO_SETTINGS_MODULE":"settings", aenv = {"DJANGO_SETTINGS_MODULE":"settings",
"DATABASE_NAME":settings.DATABASES.get("default", {}).get("NAME") or settings.DATABASE_NAME} "DATABASE_NAME":settings.DATABASES.get("default", {}).get("NAME") or settings.DATABASE_NAME}
if PROCPOOL_DEBUG: if PROCPOOL_DEBUG:
_BOOTSTRAP = _BOOTSTRAP % "log.startLogging(sys.stderr)" _BOOTSTRAP = _BOOTSTRAP % "log.startLogging(sys.stderr)"
else: else:
_BOOTSTRAP = _BOOTSTRAP % "" _BOOTSTRAP = _BOOTSTRAP % ""
procpool_starter = ampoule_main.ProcessStarter(packages=apackages, procpool_starter = ampoule_main.ProcessStarter(packages=apackages,
env=aenv, env=aenv,
path=PROCPOOL_DIRECTORY, path=PROCPOOL_DIRECTORY,
uid=PROCPOOL_UID, uid=PROCPOOL_UID,
gid=PROCPOOL_GID, gid=PROCPOOL_GID,
bootstrap=_BOOTSTRAP, bootstrap=_BOOTSTRAP,
childReactor=os.name == 'nt' and "select" or "epoll") childReactor=sys.platform == 'linux2' and "epoll" or "default")
procpool = ampoule_pool.ProcessPool(name=SERVICE_NAME, procpool = ampoule_pool.ProcessPool(name=SERVICE_NAME,
min=PROCPOOL_MIN_NPROC, min=PROCPOOL_MIN_NPROC,
max=PROCPOOL_MAX_NPROC, max=PROCPOOL_MAX_NPROC,