ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-19 07:48:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reinstate creation of node.url files upon startup

Browse Source 
a recent purge of the start.html code also took away the logic that wrote
'node.url' into the node root.  this is required for the tahoe cli tool to 
find the node.  this puts back a limited fraction of that code, so that the
node writes out a node.url file upon startup.
This commit is contained in:
robk-tahoe
2008-01-07 18:04:56 -07:00
parent 63c12f96ef
commit 08c3ee73a2
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/allmydata/client.py
View File

@ -97,7 +97,8 @@ class Client(node.Node, Referenceable, testutil.PollMixin):
self.log("init_web(webport=%s)", args=(webport,)) self.log("init_web(webport=%s)", args=(webport,))
from allmydata.webish import WebishServer from allmydata.webish import WebishServer
ws = WebishServer(webport) nodeurl_path = os.path.join(self.basedir, "node.url")
ws = WebishServer(webport, nodeurl_path)
if self.get_config("webport_allow_localfile") is not None: if self.get_config("webport_allow_localfile") is not None:
ws.allow_local_access(True) ws.allow_local_access(True)
self.add_service(ws) self.add_service(ws)

22
src/allmydata/webish.py
View File

@ -1,7 +1,7 @@
from base64 import b32encode from base64 import b32encode
import os.path import os.path
from twisted.application import service, strports from twisted.application import service, strports, internet
from twisted.web import static, resource, server, html, http from twisted.web import static, resource, server, html, http
from twisted.python import util, log from twisted.python import util, log
from twisted.internet import defer from twisted.internet import defer
@ -1372,7 +1372,7 @@ class LocalAccess:
class WebishServer(service.MultiService): class WebishServer(service.MultiService):
name = "webish" name = "webish"
def __init__(self, webport): def __init__(self, webport, nodeurl_path):
service.MultiService.__init__(self) service.MultiService.__init__(self)
self.webport = webport self.webport = webport
self.root = Root() self.root = Root()
@ -1384,6 +1384,8 @@ class WebishServer(service.MultiService):
s.setServiceParent(self) s.setServiceParent(self)
self.listener = s # stash it so the tests can query for the portnum self.listener = s # stash it so the tests can query for the portnum
self._started = defer.Deferred() self._started = defer.Deferred()
if nodeurl_path:
self._started.addCallback(self._write_nodeurl_file, nodeurl_path)
def allow_local_access(self, enable=True): def allow_local_access(self, enable=True):
self.allow_local.local_access = enable self.allow_local.local_access = enable
@ -1399,3 +1401,19 @@ class WebishServer(service.MultiService):
# apparently 'ISite' does not exist # apparently 'ISite' does not exist
#self.site._client = self.parent #self.site._client = self.parent
self._started.callback(None) self._started.callback(None)
def _write_nodeurl_file(self, junk, nodeurl_path):
# what is our webport?
s = self.listener
if isinstance(s, internet.TCPServer):
base_url = "http://localhost:%d" % s._port.getHost().port
elif isinstance(s, internet.SSLServer):
base_url = "https://localhost:%d" % s._port.getHost().port
else:
base_url = None
if base_url:
f = open(nodeurl_path, 'wb')
# this file is world-readable
f.write(base_url + "\n")
f.close()