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

make options work, config API usage

Browse Source
This commit is contained in:
meejah 2018-09-24 15:06:03 -06:00
parent a884c75ef6
commit e453db879a
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/allmydata/client.py
View File

@ -59,8 +59,8 @@ def _valid_config_sections():
"shares.needed", "shares.needed",
"shares.total", "shares.total",
"stats_gatherer.furl", "stats_gatherer.furl",
"grid_managers",
), ),
"grid_managers": None, # means "any options valid"
"drop_upload": ( # deprecated already? "drop_upload": ( # deprecated already?
"enabled", "enabled",
), ),
@ -83,6 +83,7 @@ def _valid_config_sections():
"readonly", "readonly",
"reserved_space", "reserved_space",
"storage_dir", "storage_dir",
"grid_manager_certificate_files",
), ),
"sftpd": ( "sftpd": (
"accounts.file", "accounts.file",
@ -385,9 +386,9 @@ def create_storage_farm_broker(config, default_connection_handlers, foolscap_con
# grid manager setup # grid manager setup
grid_manager_keys = [] grid_manager_keys = []
gm_keydata = self.get_config('client', 'grid_manager_public_keys', '') for name, gm_key in config.enumerate_section('grid_managers').items():
for name, gm_key in self.config.enumerate_section('grid_managers').items():
# XXX FIXME this needs pub-v0- prefix then ... # XXX FIXME this needs pub-v0- prefix then ...
print("KEY: {}".format(gm_key))
grid_manager_keys.append( grid_manager_keys.append(
keyutil.parse_pubkey(gm_key) keyutil.parse_pubkey(gm_key)
) )
@ -405,8 +406,7 @@ def create_storage_farm_broker(config, default_connection_handlers, foolscap_con
tub_maker=tub_creator, tub_maker=tub_creator,
preferred_peers=preferred_peers, preferred_peers=preferred_peers,
grid_manager_keys=grid_manager_keys, grid_manager_keys=grid_manager_keys,
node_pubkey=my_pubkey, ## node_pubkey=my_pubkey,
) )
for ic in introducer_clients: for ic in introducer_clients:
sb.use_introducer(ic) sb.use_introducer(ic)
@ -609,7 +609,7 @@ class _Client(node.Node, pollmixin.PollMixin):
grid_manager_certificates = [] grid_manager_certificates = []
cert_fnames = self.get_config("storage", "grid_manager_certificate_files", "") cert_fnames = self.get_config("storage", "grid_manager_certificate_files", "")
for fname in cert_fnames.split(): for fname in cert_fnames.split():
fname = abspath_expanduser_unicode(fname.decode('ascii'), base=self.basedir) fname = self.config.get_config_path(fname.decode('ascii'))
if not os.path.exists(fname): if not os.path.exists(fname):
raise ValueError( raise ValueError(
"Grid Manager certificate file '{}' doesn't exist".format( "Grid Manager certificate file '{}' doesn't exist".format(
@ -632,8 +632,7 @@ class _Client(node.Node, pollmixin.PollMixin):
# of the Grid Manager (should that go in the config too, # of the Grid Manager (should that go in the config too,
# then? How to handle multiple grid-managers?) # then? How to handle multiple grid-managers?)
furl_file = self.config.get_private_path("storage.furl").encode(get_filesystem_encoding())
furl_file = os.path.join(self.basedir, "private", "storage.furl").encode(get_filesystem_encoding())
furl = self.tub.registerReference(ss, furlFile=furl_file) furl = self.tub.registerReference(ss, furlFile=furl_file)
ann = { ann = {
"anonymous-storage-FURL": furl, "anonymous-storage-FURL": furl,

17
src/allmydata/util/configutil.py
View File

@ -51,12 +51,13 @@ def validate_config(fname, cfg, valid_sections):
section=section, section=section,
) )
) )
for option in cfg.options(section): if valid_in_section is not None:
if option not in valid_in_section: for option in cfg.options(section):
raise UnknownConfigError( if option not in valid_in_section:
"'{fname}' section [{section}] contains unknown option '{option}'".format( raise UnknownConfigError(
fname=fname, "'{fname}' section [{section}] contains unknown option '{option}'".format(
section=section, fname=fname,
option=option, section=section,
option=option,
)
) )
)