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

Merge pull request #1025 from coollabsio/ijpatricio-wip-7

Browse Source 
Add structure to the output content that is persisted
This commit is contained in:
Andras Bacsai
2023-04-03 13:38:36 +02:00
committed by GitHub
parent ecfbdc4870 13fbdc2340
commit b68600582c
6 changed files with 155 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Actions/RemoteProcess/RunRemoteProcess.php
View File

@@ -7,7 +7,6 @@ use App\Enums\ProcessStatus;
use Illuminate\Process\ProcessResult;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Process;
use Illuminate\Support\Facades\Storage;
use Spatie\Activitylog\Models\Activity;
class RunRemoteProcess
@@ -26,9 +25,12 @@ class RunRemoteProcess
protected $throttleIntervalMS = 500;
protected string $stdOutIncremental = '';
protected int $counter = 1;
protected string $stdErrIncremental = '';
public const MARK_START = "|--";
public const MARK_END = "--|";
public const SEPARATOR = '|';
public const MARK_REGEX = "/(\|--\d+\|\d+\|(?:out|err)--\|)/";
/**
* Create a new job instance.
@@ -88,15 +90,10 @@ class RunRemoteProcess
if ($this->hideFromOutput) {
return;
}
$this->currentTime = $this->elapsedTime();
if ($type === 'out') {
$this->stdOutIncremental .= $output;
} else {
$this->stdErrIncremental .= $output;
}
$this->activity->description .= $output;
$this->activity->description .= $this->encodeOutput($type, $output);
if ($this->isAfterLastThrottle()) {
// Let's write to database.
@@ -107,6 +104,16 @@ class RunRemoteProcess
}
}
public function encodeOutput($type, $output)
{
return
static::MARK_START . $this->counter++ .
static::SEPARATOR . $this->elapsedTime() .
static::SEPARATOR . $type .
static::MARK_END .
$output;
}
/**
* Determines if it's time to write again to database.
*

90
app/Actions/RemoteProcess/TidyOutput.php Normal file
View File

@@ -0,0 +1,90 @@
<?php
namespace App\Actions\RemoteProcess;
use Illuminate\Support\Collection;
use Spatie\Activitylog\Models\Activity;
class TidyOutput
{
protected $output;
public function __construct(
protected Activity $activity
)
{
}
public function __invoke()
{
$chunks = preg_split(
RunRemoteProcess::MARK_REGEX,
$this->activity->description,
flags: PREG_SPLIT_DELIM_CAPTURE
);
$tidyRows = $this
->joinMarksWithFollowingItem($chunks)
->reject(fn($i) => $i === '')
->map(function ($i) {
if (!preg_match('/\|--(\d+)\|(\d+)\|(out|err)--\|(.*)/', $i, $matches)) {
return $i;
}
[$wholeLine, $sequence, $elapsedTime, $type, $output] = $matches;
return [
'sequence' => $sequence,
'time' => $elapsedTime,
'type' => $type,
'output' => $output,
];
});
return $tidyRows
->sortBy(fn($i) => $i['sequence'])
->map(fn($i) => $i['output'])
->implode("\n");
}
/**
* Function to join the defined mark, with the output
* that is the following element in the array.
*
* Turns this:
* [
* "|--1|149|out--|",
* "/root\n",
* "|--2|251|out--|",
* "Welcome 1 times 1\n",
* "|--3|366|out--|",
* "Welcome 2 times 2\n",
* "|--4|466|out--|",
* "Welcome 3 times 3\n",
* ]
*
* into this:
*
* [
* "|--1|149|out--|/root\n",
* "|--2|251|out--|Welcome 1 times 1\n",
* "|--3|366|out--|Welcome 2 times 2\n",
* "|--4|466|out--|Welcome 3 times 3\n",
* ]
*/
public function joinMarksWithFollowingItem($chunks): Collection
{
return collect($chunks)->reduce(function ($carry, $item) {
$last = $carry->last();
if (preg_match(RunRemoteProcess::MARK_REGEX, $last) && !preg_match(RunRemoteProcess::MARK_REGEX, $item)) {
// If the last element is a delimiter and the current element is not,
// join them together and replace the last element with the joined string
$carry->pop();
$joined = $last . $item;
$carry->push($joined);
} else {
// Otherwise, just add the current element to the result array
$carry->push($item);
}
return $carry;
}, collect());
}
}