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

use foolscap's new app_versions API, require foolscap-0.3.1

Browse Source
This commit is contained in:
Brian Warner 2008-09-20 11:38:53 -07:00
parent 063f85d157
commit c6999d219e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_auto_deps.py
View File

@ -1,5 +1,5 @@
install_requires=["zfec >= 1.1.0",
"foolscap[secure_connections] >= 0.3.0",
"foolscap[secure_connections] >= 0.3.1",
"simplejson >= 1.4",
# pycryptopp < 0.5 had a bug which, using a Microsoft

12
src/allmydata/node.py
View File

@ -15,13 +15,13 @@ from allmydata.util.assertutil import precondition
# Just to get their versions:
import allmydata, pycryptopp, zfec
from foolscap.logging.publish import LogPublisher
from foolscap.logging import app_versions
# Add our application versions to the data that Foolscap's LogPublisher
# reports. Our __version__ attributes are actually instances of a "Version"
# class, so convert them into strings first.
LogPublisher.versions['allmydata'] = str(allmydata.__version__)
LogPublisher.versions['zfec'] = str(zfec.__version__)
LogPublisher.versions['pycryptopp'] = str(pycryptopp.__version__)
app_versions.add_version('allmydata', str(allmydata.__version__))
app_versions.add_version('zfec', str(zfec.__version__))
app_versions.add_version('pycryptopp', str(pycryptopp.__version__))
# group 1 will be addr (dotted quad string), group 3 if any will be portnum (string)
ADDR_RE=re.compile("^([1-9][0-9]*\.[1-9][0-9]*\.[1-9][0-9]*\.[1-9][0-9]*)(:([1-9][0-9]*))?$")
@ -90,6 +90,10 @@ class Node(service.MultiService):
self.log("Node constructed. " + get_package_versions_string())
iputil.increase_rlimits()
def get_app_versions(self):
# TODO: merge this with allmydata.get_package_versions
return dict(app_versions.versions)
def get_config(self, name, required=False):
"""Get the (string) contents of a config file, or None if the file
did not exist. If required=True, raise an exception rather than