ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 13:33:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

create_node: slight refactoring

Browse Source 
This prepares for various listeners to contribute values to tub.port and
tub.location, which will be helpful once Tor support is added.
This commit is contained in:
Brian Warner 2016-10-08 22:22:28 -04:00
parent b5aaafbe68
commit 1e418ade83
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/allmydata/scripts/create_node.py
View File

@ -150,6 +150,8 @@ def write_node_config(c, config):
c.write("web.static = public_html\n")
listeners = config['listen'].split(",")
tub_ports = []
tub_locations = []
if listeners == ["none"]:
c.write("tub.port = disabled\n")
c.write("tub.location = disabled\n")
@ -162,14 +164,18 @@ def write_node_config(c, config):
"see ticket #2490 for details")
if "tcp" in listeners:
if config["port"]: # --port/--location are a pair
c.write("tub.port = %s\n" % config["port"].encode('utf-8'))
c.write("tub.location = %s\n" % config["location"].encode('utf-8'))
tub_ports.append(config["port"].encode('utf-8'))
tub_locations.append(config["location"].encode('utf-8'))
else:
assert "hostname" in config
hostname = config["hostname"]
new_port = iputil.allocate_tcp_port()
c.write("tub.port = tcp:%s\n" % new_port)
c.write("tub.location = tcp:%s:%s\n" % (hostname.encode('utf-8'), new_port))
tub_ports.append("tcp:%s" % new_port)
tub_locations.append("tcp:%s:%s" % (hostname.encode('utf-8'),
new_port))
c.write("tub.port = %s\n" % ",".join(tub_ports))
c.write("tub.location = %s\n" % ",".join(tub_locations))
c.write("\n")
c.write("#log_gatherer.furl =\n")
c.write("#timeout.keepalive =\n")