Skip to content

fix(activity:log): drop stray query params from log stream URL #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miguelsanchez-upsun merged 2 commits into from
Apr 29, 2026
Merged

fix(activity:log): drop stray query params from log stream URL #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afe4a00
fix(activity:log): strip stray query params from log stream URL
pjcdawkins Apr 29, 2026
d6c4611
fix(activity:log): wait the intended 0.5s between log stream retries
pjcdawkins Apr 29, 2026
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
9 changes: 8 additions & 1 deletion legacy/src/Service/ActivityMonitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,13 @@ private function getLogStream(Activity $activity, ProgressBar $bar)
{
$url = $activity->getLink('log');

// Strip any query string from the URL. The log link can inherit query
// parameters (such as "count") from the base activities collection
// URL, and those are rejected by the log endpoint with HTTP 400.
if (($queryPos = \strpos($url, '?')) !== false) {
$url = \substr($url, 0, $queryPos);
}

// Try fetching the stream with a 10 second timeout per call, and a .5
// second interval between calls, for up to 2 minutes.
$readTimeout = 10;
Expand All @@ -705,7 +712,7 @@ private function getLogStream(Activity $activity, ProgressBar $bar)
throw new \RuntimeException('Failed to open activity log stream: ' . $url);
}
$bar->advance();
\usleep((int) $interval * 1000000);
\usleep((int) ($interval * 1000000));
$bar->advance();
$stream = \fopen($url, 'r', false, $this->api->getStreamContext($readTimeout));
}
Expand Down
Loading