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

Made new tickerhandler store_key more ubiquitous, in case of not stopping server before pulling latest.

Browse source
This commit is contained in:
Griatch 2014-10-20 06:07:15 +02:00
parent f6b9b7e1a9
commit dd937cdcd3
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/scripts/tickerhandler.py
View file

@ -237,9 +237,11 @@ class TickerHandler(object):
start_delays = dict((interval, ticker.task.next_call_time()) start_delays = dict((interval, ticker.task.next_call_time())
for interval, ticker in self.ticker_pool.tickers.items()) for interval, ticker in self.ticker_pool.tickers.items())
# update the timers for the tickers # update the timers for the tickers
for (obj, interval, idstring), (args, kwargs) in self.ticker_storage.items(): #for (obj, interval, idstring), (args, kwargs) in self.ticker_storage.items():
for store_key, (args, kwargs) in self.ticker_storage.items():
interval = store_key[1]
# this is a mutable, so it's updated in-place in ticker_storage
kwargs["_start_delay"] = start_delays.get(interval, None) kwargs["_start_delay"] = start_delays.get(interval, None)
ServerConfig.objects.conf(key=self.save_name, ServerConfig.objects.conf(key=self.save_name,
value=dbserialize(self.ticker_storage)) value=dbserialize(self.ticker_storage))
else: else:
@ -256,7 +258,7 @@ class TickerHandler(object):
#print "restore:", self.ticker_storage #print "restore:", self.ticker_storage
for store_key, (args, kwargs) in self.ticker_storage.items(): for store_key, (args, kwargs) in self.ticker_storage.items():
if len(store_key) == 2: if len(store_key) == 2:
# old form of store_key # old form of store_key - update it
store_key = (store_key[0], store_key[1], "") store_key = (store_key[0], store_key[1], "")
obj, interval, idstring = store_key obj, interval, idstring = store_key
obj = unpack_dbobj(obj) obj = unpack_dbobj(obj)