open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor expiration cleanups

Browse Source
This commit is contained in:
Brian Warner 2015-05-04 18:19:40 -07:00
parent 183303e11e
commit d7415b7053
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wormhole/servers/relay.py
View File

@ -13,7 +13,8 @@ HOUR = 60*MINUTE
DAY = 24*HOUR
MB = 1000*1000
CHANNEL_EXPIRATION_TIME = 1*HOUR
CHANNEL_EXPIRATION_TIME = 3*DAY
EXPIRATION_CHECK_PERIOD = 2*HOUR
class EventsProtocol:
def __init__(self, request):
@ -66,10 +67,8 @@ class Channel(resource.Resource):
self.relay = relay
self.db = db
self.welcome = welcome
self.expire_at = time.time() + CHANNEL_EXPIRATION_TIME
self.event_channels = set() # (side, msgnum, ep)
def render_GET(self, request):
# rest of URL is: SIDE/poll/MSGNUM
their_side = request.postpath[0]
@ -97,7 +96,6 @@ class Channel(resource.Resource):
def _shutdown(self, _, handle):
self.event_channels.discard(handle)
def message_added(self, msg_side, msg_msgnum, msg_str, channels=None):
if channels is None:
channels = self.event_channels
@ -106,7 +104,6 @@ class Channel(resource.Resource):
data = json.dumps({ "side": msg_side, "message": msg_str })
their_ep.sendEvent(data)
def render_POST(self, request):
# rest of URL is: SIDE/(MSGNUM|deallocate)/(post|poll)
side = request.postpath[0]
@ -202,8 +199,6 @@ class ChannelList(resource.Resource):
"channel-ids": allocated})+"\n"
class Relay(resource.Resource):
PRUNE_AGE = 3*DAY # old channels expire after 3 days
def __init__(self, db, welcome):
resource.Resource.__init__(self)
self.db = db
@ -251,7 +246,7 @@ class Relay(resource.Resource):
(channel_id, len(get_allocated(self.db)), len(self.channels)))
def prune_old_channels(self):
old = time.time() - self.PRUNE_AGE
old = time.time() - CHANNEL_EXPIRATION_TIME
for channel_id in get_allocated(self.db):
c = self.db.execute("SELECT `when` FROM `messages`"
" WHERE `channel_id`=?"
@ -408,7 +403,8 @@ class RelayServer(service.MultiService):
self.relayport_service.setServiceParent(self)
self.relay = Relay(self.db, welcome) # accessible from tests
self.root.putChild("wormhole-relay", self.relay)
t = internet.TimerService(2*HOUR, self.relay.prune_old_channels)
t = internet.TimerService(EXPIRATION_CHECK_PERIOD,
self.relay.prune_old_channels)
t.setServiceParent(self)
self.transit = Transit()
self.transit.setServiceParent(self) # for the timer