Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ooniapi/services/ooniprobe/src/ooniprobe/metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,7 @@ class Metrics:
)

TEST_LIST_URLS_COUNT = Gauge("test_list_urls_count", "Size of reported test list")

CLIENT_DISCONNECT = Counter(
"client_upload_disconnect", "Client disconnected while awaiting report"
)
11 changes: 10 additions & 1 deletion ooniapi/services/ooniprobe/src/ooniprobe/routers/reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,16 @@ async def receive_measurement(
Metrics.MSMNT_DISCARD_CC_ZZ.inc()
return empty_measurement

data = await request.body()
try:
data = await request.body()
except ClientDisconnect:
log.info(f"Client disconnected mid-upload")
Metrics.CLIENT_DISCONNECT.inc()
error("Client disconnect")
except Exception as e:
log.error(f"Uncaught exception {e}")
error("Server error", status_code=500)

if content_encoding == "zstd":
try:
compressed_len = len(data)
Expand Down
Loading