dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #3302 from mahansky/deployment-logs-improvements

Browse Source 
deployment log improvements
This commit is contained in:
Andras Bacsai
2024-09-05 10:29:10 +02:00
committed by GitHub
parent 4888f4c405 3b533c7d06
commit 401c410adb
3 changed files with 109 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
bootstrap/helpers/remoteProcess.php
View File

@@ -234,6 +234,7 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_d
return collect([]);
}
// ray($decoded );
$seenCommands = collect();
$formatted = collect($decoded);
if (! $is_debug_enabled) {
$formatted = $formatted->filter(fn ($i) => $i['hidden'] === false ?? false);
@@ -244,7 +245,42 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_d
data_set($i, 'timestamp', Carbon::parse(data_get($i, 'timestamp'))->format('Y-M-d H:i:s.u'));
return $i;
});
})
->reduce(function ($deploymentLogLines, $logItem) use ($seenCommands) {
$command = $logItem['command'];
$isStderr = $logItem['type'] === 'stderr';
$isNewCommand = ! is_null($command) && ! $seenCommands->first(function ($seenCommand) use ($logItem) {
return $seenCommand['command'] === $logItem['command'] && $seenCommand['batch'] === $logItem['batch'];
});
if ($isNewCommand) {
$deploymentLogLines->push([
'line' => $command,
'timestamp' => $logItem['timestamp'],
'stderr' => $isStderr,
'hidden' => $logItem['hidden'],
'command' => true,
]);
$seenCommands->push([
'command' => $command,
'batch' => $logItem['batch'],
]);
}
$lines = explode(PHP_EOL, $logItem['output']);
foreach ($lines as $line) {
$deploymentLogLines->push([
'line' => $line,
'timestamp' => $logItem['timestamp'],
'stderr' => $isStderr,
'hidden' => $logItem['hidden'],
]);
}
return $deploymentLogLines;
}, collect());
return $formatted;
}