Skip to content

Introduce FPM_TEST_DEBUG_FILTER env var and extend multi request tracing #17239

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
merged 1 commit into from
Dec 22, 2024
Merged

Introduce FPM_TEST_DEBUG_FILTER env var and extend multi request tracing #17239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions sapi/fpm/tests/tester.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,11 +401,15 @@ class Tester
bool $debug = null,
string $clientTransport = 'stream'
) {
$this->configTemplate = $configTemplate;
$this->code = $code;
$this->options = $options;
$this->fileName = $fileName ?: self::getCallerFileName();
$this->debug = $debug !== null ? $debug : (bool)getenv('TEST_FPM_DEBUG');
$this->configTemplate = $configTemplate;
$this->code = $code;
$this->options = $options;
$this->fileName = $fileName ?: self::getCallerFileName();
if (($debugFilter = getenv('TEST_FPM_DEBUG_FILTER')) !== false) {
$this->debug = str_contains(basename($this->fileName), $debugFilter);
} else {
$this->debug = $debug !== null ? $debug : (bool)getenv('TEST_FPM_DEBUG');
}
$this->logReader = new LogReader($this->debug);
$this->logTool = new LogTool($this->logReader, $this->debug);
$this->clientTransport = $clientTransport;
Expand Down Expand Up @@ -930,6 +934,7 @@ class Tester
$requestData['headers'] ?? [],
$requestData['uri'] ?? null
);
$this->trace('Request params', $params);

if (isset($requestData['delay'])) {
usleep($requestData['delay']);
Expand Down
Loading