harry/keystone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

error logs mayne

Browse Source
This commit is contained in:
Harry Bayliss
2025-05-22 18:31:50 +01:00
parent 8575712931
commit 27a0f5b988
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Jobs/Services/RunStep.php
View File

@@ -7,6 +7,7 @@ use App\Enums\ServiceStatus;
use App\Models\Step; use App\Models\Step;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Queue\Queueable; use Illuminate\Foundation\Queue\Queueable;
use Symfony\Component\Process\Process;
class RunStep implements ShouldQueue class RunStep implements ShouldQueue
{ {
@@ -29,10 +30,16 @@ class RunStep implements ShouldQueue
$server = $this->step->deployment->target->server; $server = $this->step->deployment->target->server;
$ssh = $server->sshClient() $ssh = $server->sshClient()
->onOutput(function ($output) { ->onOutput(function ($type, $output) {
$this->step->update([ if ($type === Process::OUT) {
'logs' => $this->step->logs."\n".trim($output), $this->step->update([
]); 'logs' => $this->step->logs . "\n" . trim($output),
]);
} else {
$this->step->update([
'error_logs' => $this->step->error_logs . "\n" . trim($output),
]);
}
}); });
$result = $ssh->execute($this->step->script); $result = $ssh->execute($this->step->script);
@@ -41,7 +48,7 @@ class RunStep implements ShouldQueue
$this->step->update([ $this->step->update([
'status' => DeploymentStatus::FAILED, 'status' => DeploymentStatus::FAILED,
'finished_at' => now(), 'finished_at' => now(),
'logs' => $this->step->logs."\n".trim($result->getErrorOutput()), 'error_logs' => $this->step->error_logs . "\n" . trim($result->getErrorOutput()),
]); ]);
return; return;
@@ -72,7 +79,7 @@ class RunStep implements ShouldQueue
$this->step->update([ $this->step->update([
'status' => DeploymentStatus::FAILED, 'status' => DeploymentStatus::FAILED,
'finished_at' => now(), 'finished_at' => now(),
'logs' => $this->step->logs."\n".trim($exception->getMessage()), 'error_logs' => $this->step->error_logs . "\n" . trim($exception->getMessage()),
]); ]);
$this->step->deployment->steps()->where('order', '>', $this->step->order)->update([ $this->step->deployment->steps()->where('order', '>', $this->step->order)->update([

1
database/migrations/2025_03_31_141005_create_steps_table.php
View File

@@ -17,6 +17,7 @@ return new class extends Migration
$table->string('status'); $table->string('status');
$table->longText('script'); $table->longText('script');
$table->longText('logs')->nullable(); $table->longText('logs')->nullable();
$table->longText('error_logs')->nullable();
$table->text('secrets')->nullable(); $table->text('secrets')->nullable();
$table->dateTime('started_at')->nullable(); $table->dateTime('started_at')->nullable();
$table->dateTime('finished_at')->nullable(); $table->dateTime('finished_at')->nullable();

12
resources/js/pages/servers/Show.vue
View File

@@ -103,9 +103,17 @@ watch(counter, () => {
<CardContent class="py-4"> <CardContent class="py-4">
<div v-for="deployment in server.service_deployments" class="flex gap-4"> <div v-for="deployment in server.service_deployments" class="flex gap-4">
<div class="w-48">{{ deployment.target.name }}</div> <div class="w-48">{{ deployment.target.name }}</div>
<div> <div class="space-y-4">
<div v-for="step in deployment.steps"> <div v-for="step in deployment.steps">
{{ step }} <div class="font-semibold">
{{ step.name ?? 'Unnamed Step' }}
</div>
<div v-if="step.error_logs">
{{ step.error_logs }}
</div>
<div v-else>
{{ step.logs }}
</div>
</div> </div>
</div> </div>
</div> </div>