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

server: build ChannelList from db, not self.channels

Browse Source
This commit is contained in:
Brian Warner 2015-05-04 17:40:57 -07:00
parent 1aab908091
commit dc3f2eee43
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,14 +174,16 @@ class Allocator(resource.Resource):
"channel-id": channel_id})+"\n" "channel-id": channel_id})+"\n"
class ChannelList(resource.Resource): class ChannelList(resource.Resource):
def __init__(self, channel_ids, welcome): def __init__(self, db, welcome):
resource.Resource.__init__(self) resource.Resource.__init__(self)
self.channel_ids = channel_ids self.db = db
self.welcome = welcome self.welcome = welcome
def render_GET(self, request): def render_GET(self, request):
c = self.db.execute("SELECT DISTINCT `channel_id` FROM `allocations`")
allocated = sorted(set([row["channel_id"] for row in c.fetchall()]))
request.setHeader("content-type", "application/json; charset=utf-8") request.setHeader("content-type", "application/json; charset=utf-8")
return json.dumps({"welcome": self.welcome, return json.dumps({"welcome": self.welcome,
"channel-ids": self.channel_ids})+"\n" "channel-ids": allocated})+"\n"
class Relay(resource.Resource): class Relay(resource.Resource):
def __init__(self, db, welcome): def __init__(self, db, welcome):
@ -219,8 +221,7 @@ class Relay(resource.Resource):
if path == "allocate": if path == "allocate":
return Allocator(self, self.welcome) return Allocator(self, self.welcome)
if path == "list": if path == "list":
channel_ids = sorted(self.channels.keys()) return ChannelList(self.db, self.welcome)
return ChannelList(channel_ids, self.welcome)
if not re.search(r'^\d+$', path): if not re.search(r'^\d+$', path):
return resource.ErrorPage(http.BAD_REQUEST, return resource.ErrorPage(http.BAD_REQUEST,
"invalid channel id", "invalid channel id",