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

Some fixes for using evlang without ProcPool.

Browse source
This commit is contained in:
Griatch 2012-09-03 21:33:03 +02:00
parent 81dfeb6788
commit 12523c81b6
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
contrib/evlang/evlang.py
View file

@ -85,6 +85,8 @@ from django.core.management import setup_environ
from game import settings
setup_environ(settings)
from src.utils.utils import run_async
_PROCPOOL_ENABLED = settings.PROCPOOL_ENABLED
_LOGGER = None
#------------------------------------------------------------
@ -828,17 +830,18 @@ def limited_exec(code, context = {}, timeout_secs=2, retobj=None):
if code did not execute within the given timelimit =
LimitedExecTimeoutException
"""
if retobj:
callback = lambda r: retobj.msg(r)
errback = lambda e: retobj.msg(e)
if validate_context(context) and validate_code(code):
# run code only after validation has completed
if validate_context(context) and validate_code(code):
run_async(code, *context, proc_timeout=timeout_secs, at_return=callback, at_err=errback)
else:
# run code only after validation has completed
if validate_context(context) and validate_code(code):
run_async(code, *context)
if _PROCPOOL_ENABLED:
if retobj:
callback = lambda r: retobj.msg(r)
errback = lambda e: retobj.msg(e)
run_async(code, *context, proc_timeout=timeout_secs, at_return=callback, at_err=errback)
else:
run_async(code, *context, proc_timeout=timeout_secs)
else:
# run in-process
exec code in context
#----------------------------------------------------------------------