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

Tested working oob repeat functionality.

Browse source
This commit is contained in:
Griatch 2013-10-17 16:11:42 +02:00
parent 46c2e372bf
commit e521501cb9
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/server/oobhandler.py
View file

@ -122,15 +122,16 @@ class _RepeaterScript(Script):
""" """
Calls subscriptions every self.interval seconds Calls subscriptions every self.interval seconds
""" """
for (func_key, obj, session, interval, args, kwargs) in self.ndb.subscriptions.values(): for (func_key, sessid, interval, args, kwargs) in self.ndb.subscriptions.values():
session = SESSIONS.session_from_sessid(sessid)
OOB_HANDLER.execute_cmd(session, func_key, *args, **kwargs) OOB_HANDLER.execute_cmd(session, func_key, *args, **kwargs)
def subscribe(self, store_key, obj, session, func_key, interval, *args, **kwargs): def subscribe(self, store_key, sessid, func_key, interval, *args, **kwargs):
""" """
Sign up a subscriber to this oobfunction. Subscriber is Sign up a subscriber to this oobfunction. Subscriber is
a database object with a dbref. a database object with a dbref.
""" """
self.ndb.subscriptions[store_key] = (func_key, obj, session, interval, args, kwargs) self.ndb.subscriptions[store_key] = (func_key, sessid, interval, args, kwargs)
def unsubscribe(self, store_key): def unsubscribe(self, store_key):
""" """
@ -151,7 +152,7 @@ class _RepeaterPool(object):
def __init__(self): def __init__(self):
self.scripts = {} self.scripts = {}
def add(self, store_key, obj, sessid, func_key, interval, *args, **kwargs): def add(self, store_key, sessid, func_key, interval, *args, **kwargs):
""" """
Add a new tracking Add a new tracking
""" """
@ -159,8 +160,7 @@ class _RepeaterPool(object):
# if no existing interval exists, create new script to fill the gap # if no existing interval exists, create new script to fill the gap
new_tracker = create_script(_RepeaterScript, key="oob_repeater_%is" % interval, interval=interval) new_tracker = create_script(_RepeaterScript, key="oob_repeater_%is" % interval, interval=interval)
self.scripts[interval] = new_tracker self.scripts[interval] = new_tracker
session = SESSIONS.session_from_sessid(sessid) self.scripts[interval].subscribe(store_key, sessid, func_key, interval, *args, **kwargs)
self.scripts[interval].subscribe(store_key, obj, session, func_key, interval, *args, **kwargs)
def remove(self, store_key, interval): def remove(self, store_key, interval):
""" """
@ -172,6 +172,14 @@ class _RepeaterPool(object):
# no more subscriptions for this interval. Clean out the script. # no more subscriptions for this interval. Clean out the script.
self.scripts[interval].stop() self.scripts[interval].stop()
def stop(self):
"""
Stop all scripts in pool. This is done at server reload since restoring the pool
will automatically re-populate the pool.
"""
for script in self.scripts.values():
script.stop()
# Main OOB Handler # Main OOB Handler
@ -201,6 +209,7 @@ class OOBHandler(object):
if self.oob_repeat_storage: if self.oob_repeat_storage:
print "saved repeat_storage:", self.oob_repeat_storage print "saved repeat_storage:", self.oob_repeat_storage
ServerConfig.objects.conf(key="oob_repeat_storage", value=dbserialize(self.oob_repeat_storage)) ServerConfig.objects.conf(key="oob_repeat_storage", value=dbserialize(self.oob_repeat_storage))
self.oob_tracker_pool.stop()
def restore(self): def restore(self):
""" """
@ -226,7 +235,6 @@ class OOBHandler(object):
# make sure to purge the storage # make sure to purge the storage
ServerConfig.objects.conf(key="oob_repeat_storage", delete=True) ServerConfig.objects.conf(key="oob_repeat_storage", delete=True)
def track(self, obj, sessid, fieldname, trackerclass, *args, **kwargs): def track(self, obj, sessid, fieldname, trackerclass, *args, **kwargs):
""" """
Create an OOB obj of class _oob_MAPPING[tracker_key] on obj. args, Create an OOB obj of class _oob_MAPPING[tracker_key] on obj. args,
@ -323,7 +331,7 @@ class OOBHandler(object):
store_key = (store_obj, sessid, func_key, interval) store_key = (store_obj, sessid, func_key, interval)
# prepare to store # prepare to store
self.oob_repeat_storage[store_key] = (store_obj, sessid, func_key, interval, args, kwargs) self.oob_repeat_storage[store_key] = (store_obj, sessid, func_key, interval, args, kwargs)
self.oob_tracker_pool.add(store_key, obj, sessid, func_key, interval, *args, **kwargs) self.oob_tracker_pool.add(store_key, sessid, func_key, interval, *args, **kwargs)
def unrepeat(self, obj, sessid, func_key, interval=20): def unrepeat(self, obj, sessid, func_key, interval=20):
""" """
@ -344,6 +352,8 @@ class OOBHandler(object):
if session: if session:
session.msg(oob=(funcname, args, kwargs)) session.msg(oob=(funcname, args, kwargs))
# access method - called from msg()
def execute_cmd(self, session, func_key, *args, **kwargs): def execute_cmd(self, session, func_key, *args, **kwargs):
""" """
Retrieve oobfunc from OOB_FUNCS and execute it immediately Retrieve oobfunc from OOB_FUNCS and execute it immediately