Skip to content

max_execution_time in module #95

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 2 commits into from
Oct 15, 2025
Merged

max_execution_time in module #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fac00c
Comment
timkelty Jul 3, 2025
ac8d572
Set in module
timkelty Jul 3, 2025
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: 15 additions & 0 deletions src/Module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ public function getConfig(): Config

protected function bootstrapCloud(ConsoleApplication|WebApplication $app): void
{
ini_set(
'max_execution_time',
(string) $this->getMaxExecutionSeconds(),
);

// Set Craft memory limit to just below PHP's limit
$this->setMemoryLimit(
ini_get('memory_limit'),
Expand Down Expand Up @@ -221,4 +226,14 @@ private function setMemoryLimit(int|string $limit, int|string $offset = 0): int|

return $memoryLimit;
}

private function getMaxExecutionSeconds(): int
{
if (Craft::$app->getRequest()->getIsWebRequest()) {
return 60;
}

// Include a buffer so PHP's limit is always hit before Lambda's
return 900 - 3;
}
}
6 changes: 0 additions & 6 deletions src/runtime/event/EventHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
class EventHandler implements Handler
{
private FpmHandler $fpmHandler;
private const MAX_SECONDS = 900 - 3;
private const MAX_HTTP_SECONDS = 60;

public function __construct(FpmHandler $fpmHandler)
{
Expand All @@ -19,8 +17,6 @@ public function __construct(FpmHandler $fpmHandler)

public function handle(mixed $event, Context $context)
{
ini_set('max_execution_time', self::MAX_SECONDS);

// is this a sqs event?
if (isset($event['Records'])) {
return (new SqsHandler())->handle($event, $context);
Expand All @@ -31,8 +27,6 @@ public function handle(mixed $event, Context $context)
return (new CliHandler())->handle($event, $context);
}

ini_set('max_execution_time', self::MAX_HTTP_SECONDS);

return $this->fpmHandler->handle($event, $context);
}
}
Loading