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

Clean up with simpler idiom.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2023-03-27 14:54:36 -04:00
parent 0995772b24
commit 7838f25bf8
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/allmydata/storage_client.py
View File

@ -1224,20 +1224,19 @@ class HTTPNativeStorageServer(service.MultiService):
return self._istorage_server
try:
try:
storage_server = await get_istorage_server()
storage_server = await get_istorage_server()
# Get the version from the remote server. Set a short timeout since
# we're relying on this for server liveness.
self._connecting_deferred = storage_server.get_version().addTimeout(
5, self._reactor)
# We don't want to do another iteration of the loop until this
# iteration has finished, so wait here:
version = await self._connecting_deferred
self._got_version(version)
except Exception as e:
log.msg(f"Failed to connect to a HTTP storage server: {e}", level=log.CURIOUS)
self._failed_to_connect(Failure(e))
# Get the version from the remote server. Set a short timeout since
# we're relying on this for server liveness.
self._connecting_deferred = storage_server.get_version().addTimeout(
5, self._reactor)
# We don't want to do another iteration of the loop until this
# iteration has finished, so wait here:
version = await self._connecting_deferred
self._got_version(version)
except Exception as e:
log.msg(f"Failed to connect to a HTTP storage server: {e}", level=log.CURIOUS)
self._failed_to_connect(Failure(e))
finally:
self._connecting_deferred = None