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

server.py: move twisted.web.resource out of the way

Browse Source
This commit is contained in:
Brian Warner 2017-07-31 14:01:54 -07:00
parent 615986b0dc
commit 0c679e74ce
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wormhole/server/server.py
View File

@ -5,7 +5,8 @@ import os, time, json
from twisted.python import log from twisted.python import log
from twisted.internet import reactor, endpoints from twisted.internet import reactor, endpoints
from twisted.application import service, internet from twisted.application import service, internet
from twisted.web import server, static, resource from twisted.web import server, static
from twisted.web.resource import Resource
from autobahn.twisted.resource import WebSocketResource from autobahn.twisted.resource import WebSocketResource
from .database import get_db from .database import get_db
from .rendezvous import Rendezvous from .rendezvous import Rendezvous
@ -18,10 +19,10 @@ MINUTE = 60*SECONDS
CHANNEL_EXPIRATION_TIME = 11*MINUTE CHANNEL_EXPIRATION_TIME = 11*MINUTE
EXPIRATION_CHECK_PERIOD = 10*MINUTE EXPIRATION_CHECK_PERIOD = 10*MINUTE
class Root(resource.Resource): class Root(Resource):
# child_FOO is a nevow thing, not a twisted.web.resource thing # child_FOO is a nevow thing, not a twisted.web.resource thing
def __init__(self): def __init__(self):
resource.Resource.__init__(self) Resource.__init__(self)
self.putChild(b"", static.Data(b"Wormhole Relay\n", "text/plain")) self.putChild(b"", static.Data(b"Wormhole Relay\n", "text/plain"))
class PrivacyEnhancedSite(server.Site): class PrivacyEnhancedSite(server.Site):