mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-03 19:57:41 +02:00
Code Issues Releases Wiki Activity

ProcessHandler: Make timeout of stream_select() configurable (#1916)

Browse Source 
Co-authored-by: Jordi Boggiano <j.boggiano@seld.be>
This commit is contained in:
Eric Emmrich
2024-10-23 15:31:42 +02:00
committed by GitHub
parent 3327c29d37
commit 2497a896b1
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Monolog/Handler/ProcessHandler.php
View File

@@ -43,6 +43,8 @@ class ProcessHandler extends AbstractProcessingHandler
*/ */
private array $pipes = []; private array $pipes = [];
private float $timeout;
/** /**
* @var array<int, string[]> * @var array<int, string[]>
*/ */
@@ -56,9 +58,10 @@ class ProcessHandler extends AbstractProcessingHandler
* @param string $command Command for the process to start. Absolute paths are recommended, * @param string $command Command for the process to start. Absolute paths are recommended,
* especially if you do not use the $cwd parameter. * especially if you do not use the $cwd parameter.
* @param string|null $cwd "Current working directory" (CWD) for the process to be executed in. * @param string|null $cwd "Current working directory" (CWD) for the process to be executed in.
* @param float $timeout The maximum timeout (in seconds) for the stream_select() function.
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function __construct(string $command, int|string|Level $level = Level::Debug, bool $bubble = true, ?string $cwd = null) public function __construct(string $command, int|string|Level $level = Level::Debug, bool $bubble = true, ?string $cwd = null, float $timeout = 1.0)
{ {
if ($command === '') { if ($command === '') {
throw new \InvalidArgumentException('The command argument must be a non-empty string.'); throw new \InvalidArgumentException('The command argument must be a non-empty string.');
@@ -71,6 +74,7 @@ class ProcessHandler extends AbstractProcessingHandler
$this->command = $command; $this->command = $command;
$this->cwd = $cwd; $this->cwd = $cwd;
$this->timeout = $timeout;
} }
/** /**
@@ -146,7 +150,8 @@ class ProcessHandler extends AbstractProcessingHandler
$empty = []; $empty = [];
$errorPipes = [$this->pipes[2]]; $errorPipes = [$this->pipes[2]];
return stream_select($errorPipes, $empty, $empty, 1); $seconds = (int) $this->timeout;
return stream_select($errorPipes, $empty, $empty, $seconds, (int) (($this->timeout - $seconds) * 1000000));
} }
/** /**