Skip to content

Commit ec57334

Browse files
committed
rename to connection_timeout
1 parent a3e9b01 commit ec57334

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

config/task-runner.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
'storage_root' => storage_path('framework/testing/task-runner'),
3333
],
3434

35-
// The default timeout for uploading script file to server in seconds
36-
'upload_timeout' => 10,
35+
// The connection timeout for connecting to a remote server in seconds.
36+
'connection_timeout' => 10,
3737
];

src/RemoteProcessRunner.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ class RemoteProcessRunner
1414

1515
public function __construct(
1616
private Connection $connection,
17-
private ProcessRunner $processRunner
17+
private ProcessRunner $processRunner,
18+
private int $connectionTimeout = 10,
1819
) {
1920
}
2021

@@ -46,7 +47,7 @@ public function verifyScriptDirectoryExists(): self
4647
{
4748
$output = $this->run(
4849
script: 'mkdir -p '.$this->connection->scriptPath,
49-
timeout: 10
50+
timeout: $this->connectionTimeout,
5051
);
5152

5253
if ($output->isTimeout() || $output->getExitCode() !== 0) {
@@ -96,7 +97,7 @@ public function runUploadedScriptInBackground(string $script, string $output, in
9697
timeout: $timeout,
9798
);
9899

99-
return $this->run($script, 10);
100+
return $this->run($script, $this->connectionTimeout);
100101
}
101102

102103
/**
@@ -157,7 +158,7 @@ public function upload($filename, $contents): self
157158
]);
158159

159160
$output = $this->processRunner->run(
160-
FacadesProcess::command($command)->timeout(config('task-runner.upload_timeout', 10))
161+
FacadesProcess::command($command)->timeout(config('task-runner.connection_timeout', 10))
161162
);
162163

163164
if ($output->isTimeout() || $output->getExitCode() !== 0) {

src/TaskDispatcher.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function run(PendingTask $pendingTask): ?ProcessOutput
6060
/**
6161
* Runs the given task in the background.
6262
*
63-
* @return void
63+
* @return ProcessOutput
6464
*/
6565
private function runInBackground(PendingTask $pendingTask)
6666
{
@@ -71,7 +71,7 @@ private function runInBackground(PendingTask $pendingTask)
7171
);
7272

7373
return $this->processRunner->run(
74-
FacadesProcess::command($command)->timeout(10)
74+
FacadesProcess::command($command)->timeout(config('task-runner.connection_timeout', 10))
7575
);
7676
}
7777

@@ -83,7 +83,7 @@ private function runOnConnection(PendingTask $pendingTask): ProcessOutput
8383
/** @var RemoteProcessRunner $runner */
8484
$runner = app()->makeWith(
8585
RemoteProcessRunner::class,
86-
['connection' => $pendingTask->getConnection(), 'processRunner' => $this->processRunner]
86+
['connection' => $pendingTask->getConnection(), 'processRunner' => $this->processRunner, 'connectionTimeout' => config('task-runner.connection_timeout', 10)]
8787
);
8888

8989
if ($outputCallbable = $pendingTask->getOnOutput()) {

0 commit comments

Comments
 (0)