Ilgrim/kademlia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

@python3.5 - Fix saving/loading state (#37)

Browse Source 
* Fix await self.find() in crawler

* Fix state loading/saving

* Fix saveStateRegularly (it was using a Twisted function)

* Use loop.call_later for saveStateRegularly and cancel task on server.stop()

* Remove innecessary function

* Add missing initialization of save_state_loop, and changed the checks for Noneness
This commit is contained in:
Vicente Dragicevic 2017-10-16 18:17:35 -03:00 committed by Brian Muller
parent 67abd88ec2
commit a6e50acd84
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kademlia/network.py
View File

@ -40,14 +40,18 @@ class Server(object):
self.transport = None self.transport = None
self.protocol = None self.protocol = None
self.refresh_loop = None self.refresh_loop = None
self.save_state_loop = None
def stop(self): def stop(self):
if self.refresh_loop is not None:
self.refresh_loop.cancel()
if self.transport is not None: if self.transport is not None:
self.transport.close() self.transport.close()
if self.refresh_loop:
self.refresh_loop.cancel()
if self.save_state_loop:
self.save_state_loop.cancel()
def listen(self, port, interface='0.0.0.0'): def listen(self, port, interface='0.0.0.0'):
""" """
Start listening on the given port. Start listening on the given port.
@ -193,7 +197,7 @@ class Server(object):
if len(data['neighbors']) == 0: if len(data['neighbors']) == 0:
self.log.warning("No known neighbors, so not writing to cache.") self.log.warning("No known neighbors, so not writing to cache.")
return return
with open(fname, 'w') as f: with open(fname, 'wb') as f:
pickle.dump(data, f) pickle.dump(data, f)
@classmethod @classmethod
@ -202,7 +206,7 @@ class Server(object):
Load the state of this node (the alpha/ksize/id/immediate neighbors) Load the state of this node (the alpha/ksize/id/immediate neighbors)
from a cache file with the given fname. from a cache file with the given fname.
""" """
with open(fname, 'r') as f: with open(fname, 'rb') as f:
data = pickle.load(f) data = pickle.load(f)
s = Server(data['ksize'], data['alpha'], data['id']) s = Server(data['ksize'], data['alpha'], data['id'])
if len(data['neighbors']) > 0: if len(data['neighbors']) > 0:
@ -216,9 +220,9 @@ class Server(object):
Args: Args:
fname: File name to save retularly to fname: File name to save retularly to
frequencey: Frequency in seconds that the state should be saved. frequency: Frequency in seconds that the state should be saved.
By default, 10 minutes. By default, 10 minutes.
""" """
loop = LoopingCall(self.saveState, fname) self.saveState(fname)
loop.start(frequency) loop = asyncio.get_event_loop()
return loop self.save_state_loop = loop.call_later(frequency, self.saveStateRegularly, fname, frequency)