ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-08 04:10:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add logging for limited_content().

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2023-04-13 10:28:29 -04:00
parent e0ca48b707
commit 4c2f241361
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/allmydata/storage/http_client.py
View File

@ -4,13 +4,14 @@ HTTP client that talks to the HTTP storage server.
from __future__ import annotations from __future__ import annotations
from eliot import start_action, register_exception_extractor
from typing import Union, Optional, Sequence, Mapping, BinaryIO, cast, TypedDict from typing import Union, Optional, Sequence, Mapping, BinaryIO, cast, TypedDict
from base64 import b64encode from base64 import b64encode
from io import BytesIO from io import BytesIO
from os import SEEK_END from os import SEEK_END
from attrs import define, asdict, frozen, field from attrs import define, asdict, frozen, field
from eliot import start_action, register_exception_extractor
from eliot.twisted import DeferredContext
# TODO Make sure to import Python version? # TODO Make sure to import Python version?
from cbor2 import loads, dumps from cbor2 import loads, dumps
@ -160,9 +161,18 @@ def limited_content(
trickle of data continues to arrive, it will continue to run. trickle of data continues to arrive, it will continue to run.
""" """
d = succeed(None) d = succeed(None)
# Sadly, addTimeout() won't work because we need access to the IDelayedCall
# in order to reset it on each data chunk received.
timeout = clock.callLater(60, d.cancel) timeout = clock.callLater(60, d.cancel)
collector = _LengthLimitedCollector(max_length, timeout) collector = _LengthLimitedCollector(max_length, timeout)
with start_action(
action_type="allmydata:storage:http-client:limited-content",
max_length=max_length,
).context() as action:
d = DeferredContext(d)
# Make really sure everything gets called in Deferred context, treq might # Make really sure everything gets called in Deferred context, treq might
# call collector directly... # call collector directly...
d.addCallback(lambda _: treq.collect(response, collector)) d.addCallback(lambda _: treq.collect(response, collector))
@ -177,7 +187,8 @@ def limited_content(
timeout.cancel() timeout.cancel()
return f return f
return d.addCallbacks(done, failed) result = d.addCallbacks(done, failed)
return result.addActionFinish()
@define @define