Skip to content

Allow developer to control FPM Timeout via Environment Variable #771

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
mnapoli merged 3 commits into from
Oct 9, 2020
Merged

Allow developer to control FPM Timeout via Environment Variable #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9791c12
Allow developer to control FpmHandler timeout
deleugpn Oct 8, 2020
e1d0dc7
Forgot to use the variable :sweat_smile:
deleugpn Oct 8, 2020
5ee64d2
Environmnet Variable strategy for FPM Timeout
deleugpn Oct 9, 2020
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
8 changes: 7 additions & 1 deletion runtime/layers/fpm/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ if (! is_file($handlerFile)) {
$lambdaRuntime->failInitialization("Handler `$handlerFile` doesn't exist");
}

$phpFpm = new FpmHandler($handlerFile);
if (getenv('BREF_PHP_FPM_TIMEOUT')) {
$timeout = (int) getenv('BREF_PHP_FPM_TIMEOUT') * 1000;
} else {
$timeout = 30000;
}

$phpFpm = new FpmHandler($handlerFile, $timeout);
try {
$phpFpm->start();
} catch (\Throwable $e) {
Expand Down
7 changes: 5 additions & 2 deletions src/Event/Http/FpmHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,13 @@ final class FpmHandler extends HttpHandler
private $configFile;
/** @var Process|null */
private $fpm;
/** @var int */
private $socketReadWriteTimeout;

public function __construct(string $handler, string $configFile = self::CONFIG)
public function __construct(string $handler, int $socketReadWriteTimeout, string $configFile = self::CONFIG)
{
$this->handler = $handler;
$this->socketReadWriteTimeout = $socketReadWriteTimeout;
$this->configFile = $configFile;
}

Expand Down Expand Up @@ -78,7 +81,7 @@ public function start(): void
});

$this->client = new Client;
$this->connection = new UnixDomainSocket(self::SOCKET, 1000, 30000);
$this->connection = new UnixDomainSocket(self::SOCKET, 1000, $this->socketReadWriteTimeout);

$this->waitUntilReady();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Handler/FpmHandlerLoadBalancerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ private function startFpm(string $handler): void
if ($this->fpm) {
$this->fpm->stop();
}
$this->fpm = new FpmHandler($handler, __DIR__ . '/PhpFpm/php-fpm.conf');
$this->fpm = new FpmHandler($handler, 5000, __DIR__ . '/PhpFpm/php-fpm.conf');
$this->fpm->start();
}
}
6 changes: 3 additions & 3 deletions tests/Handler/FpmHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ public function test response with error_log()
*/
public function test FPM timeouts are recovered from()
{
$this->fpm = new FpmHandler(__DIR__ . '/PhpFpm/timeout.php', __DIR__ . '/PhpFpm/php-fpm.conf');
$this->fpm = new FpmHandler(__DIR__ . '/PhpFpm/timeout.php', 5000, __DIR__ . '/PhpFpm/php-fpm.conf');
$this->fpm->start();

try {
Expand Down Expand Up @@ -1124,7 +1124,7 @@ public function test warmer events do not invoke the application()
{
// Run `timeout.php` to make sure that the handler is not really executed.
// If it was, then PHP-FPM would timeout (and error).
$this->fpm = new FpmHandler(__DIR__ . '/PhpFpm/timeout.php', __DIR__ . '/PhpFpm/php-fpm.conf');
$this->fpm = new FpmHandler(__DIR__ . '/PhpFpm/timeout.php', 5000, __DIR__ . '/PhpFpm/php-fpm.conf');
$this->fpm->start();

$result = $this->fpm->handle([
Expand Down Expand Up @@ -1198,7 +1198,7 @@ private function startFpm(string $handler): void
if ($this->fpm) {
$this->fpm->stop();
}
$this->fpm = new FpmHandler($handler, __DIR__ . '/PhpFpm/php-fpm.conf');
$this->fpm = new FpmHandler($handler, 5000, __DIR__ . '/PhpFpm/php-fpm.conf');
$this->fpm->start();
}
}