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

Twisted min version upped to 15.2.1 due to a change in the LoopingCall infrastructure that Evennia relies on. This resolves #744 by updating the Evennia implementation accordingly.

Browse source
This commit is contained in:
Griatch 2015-05-27 22:35:05 +02:00
parent ff4013a58a
commit 97e04ee710
6 changed files with 61 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

9
evennia/scripts/tickerhandler.py
View file

@ -264,7 +264,10 @@ class TickerHandler(object):
def restore(self):
"""
Restore ticker_storage from database and re-initialize the handler from storage. This is triggered by the server at restart.
Restore ticker_storage from database and re-initialize the
handler from storage. This is triggered by the server at
restart.
"""
# load stored command instructions and use them to re-initialize handler
ticker_storage = ServerConfig.objects.conf(key=self.save_name)
@ -353,7 +356,9 @@ class TickerHandler(object):
"""
self.ticker_pool.stop(interval)
if interval:
self.ticker_storage = dict((store_key, store_key) for store_key in self.ticker_storage if store_key[1] != interval)
self.ticker_storage = dict((store_key, store_key)
for store_key in self.ticker_storage
if store_key[1] != interval)
else:
self.ticker_storage = {}
self.save()