ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-18 18:56:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow combining autodetected and statically configured locations. fixes #754

Browse Source 
Replaces the location 'AUTO' with the autodetected IP/port combination.

Author: Chris Kerr <debdepba@dasganma.tk>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-02-09 19:18:58 +00:00
parent ce7a867b22
commit c9a56eae2b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/allmydata/node.py
View File

@ -398,9 +398,16 @@ class Node(service.MultiService):
# next time
fileutil.write_atomically(self._portnumfile, "%d\n" % portnum, mode="")
base_location = ",".join([ "%s:%d" % (addr, portnum)
for addr in local_addresses ])
location = self.get_config("node", "tub.location", base_location)
location = self.get_config("node", "tub.location", "AUTO")
# Replace the location "AUTO" with the detected local addresses.
split_location = location.split(",")
if "AUTO" in split_location:
split_location.remove("AUTO")
split_location.extend([ "%s:%d" % (addr, portnum)
for addr in local_addresses ])
location = ",".join(split_location)
self.log("Tub location set to %s" % location)
self.tub.setLocation(location)