feat : ajout de la lecture des logs symfony et docker
This commit is contained in:
@@ -26,6 +26,7 @@ services:
|
||||
- ./LOG:/var/www/html/LOG
|
||||
- uploads_data:/var/www/html/var/uploads
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
- ${HOST_APPS_PATH}:/mnt/apps
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
depends_on:
|
||||
|
||||
113
frontend/components/ui/LogModal.vue
Normal file
113
frontend/components/ui/LogModal.vue
Normal file
@@ -0,0 +1,113 @@
|
||||
<script setup lang="ts">
|
||||
const { t } = useI18n()
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
modelValue: boolean
|
||||
title: string
|
||||
content: string
|
||||
loading?: boolean
|
||||
showLevelFilter?: boolean
|
||||
}>(), {
|
||||
loading: false,
|
||||
showLevelFilter: false,
|
||||
})
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:modelValue', value: boolean): void
|
||||
(e: 'refresh', lines: number, level: string): void
|
||||
}>()
|
||||
|
||||
const selectedLines = ref(100)
|
||||
const selectedLevel = ref('')
|
||||
|
||||
const lineOptions = [50, 100, 500, 1000]
|
||||
|
||||
const copied = ref(false)
|
||||
|
||||
function refresh() {
|
||||
emit('refresh', selectedLines.value, selectedLevel.value)
|
||||
}
|
||||
|
||||
async function copyLogs() {
|
||||
if (!props.content) return
|
||||
await navigator.clipboard.writeText(props.content)
|
||||
copied.value = true
|
||||
setTimeout(() => { copied.value = false }, 2000)
|
||||
}
|
||||
|
||||
watch(() => props.modelValue, (open) => {
|
||||
if (open) {
|
||||
copied.value = false
|
||||
refresh()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<AppModal
|
||||
:model-value="modelValue"
|
||||
@update:model-value="emit('update:modelValue', $event)"
|
||||
max-width="2xl"
|
||||
>
|
||||
<template #title>{{ title }}</template>
|
||||
|
||||
<div class="flex items-center justify-between mb-4">
|
||||
<div class="flex items-center gap-3">
|
||||
<div class="flex items-center gap-2">
|
||||
<label class="text-xs text-neutral-400">{{ t('logs.lines') }}</label>
|
||||
<select
|
||||
v-model="selectedLines"
|
||||
class="rounded-md border border-neutral-300 px-2 py-1 text-sm"
|
||||
@change="refresh"
|
||||
>
|
||||
<option v-for="n in lineOptions" :key="n" :value="n">{{ n }}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div v-if="showLevelFilter" class="flex items-center gap-2">
|
||||
<label class="text-xs text-neutral-400">{{ t('logs.level') }}</label>
|
||||
<select
|
||||
v-model="selectedLevel"
|
||||
class="rounded-md border border-neutral-300 px-2 py-1 text-sm"
|
||||
@change="refresh"
|
||||
>
|
||||
<option value="">{{ t('logs.levelAll') }}</option>
|
||||
<option value="ERROR">ERROR</option>
|
||||
<option value="WARNING">WARNING</option>
|
||||
<option value="INFO">INFO</option>
|
||||
<option value="DEBUG">DEBUG</option>
|
||||
</select>
|
||||
</div>
|
||||
<MalioButtonIcon
|
||||
icon="mdi:refresh"
|
||||
:aria-label="t('logs.refresh')"
|
||||
icon-size="18"
|
||||
@click="refresh"
|
||||
/>
|
||||
</div>
|
||||
<MalioButtonIcon
|
||||
:icon="copied ? 'mdi:check' : 'mdi:content-copy'"
|
||||
:aria-label="t('logs.copy')"
|
||||
icon-size="18"
|
||||
:button-class="copied ? 'text-green-500' : ''"
|
||||
@click="copyLogs"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<pre
|
||||
v-if="content"
|
||||
class="max-h-96 overflow-auto rounded-lg bg-neutral-900 p-4 text-xs text-green-400 font-mono whitespace-pre-wrap"
|
||||
>{{ content }}</pre>
|
||||
|
||||
<p v-else-if="!loading" class="text-center text-neutral-400 py-8">
|
||||
{{ t('logs.noContent') }}
|
||||
</p>
|
||||
|
||||
<template #footer>
|
||||
<MalioButton
|
||||
:label="t('applications.form.cancel')"
|
||||
variant="tertiary"
|
||||
@click="emit('update:modelValue', false)"
|
||||
/>
|
||||
</template>
|
||||
</AppModal>
|
||||
</template>
|
||||
@@ -2,9 +2,7 @@
|
||||
<NuxtLink
|
||||
:to="to"
|
||||
class="group/link relative flex items-center transition-colors hover:text-primary-500"
|
||||
:class="linkClasses"
|
||||
:active-class="exact ? '' : activeClass"
|
||||
:exact-active-class="exact ? activeClass : ''"
|
||||
:class="[linkClasses, isActive ? activeClass : '']"
|
||||
>
|
||||
<Icon :name="icon" :size="sub ? '20' : '24'" class="flex-shrink-0" />
|
||||
<span
|
||||
@@ -33,6 +31,15 @@ const props = defineProps<{
|
||||
exact?: boolean
|
||||
}>()
|
||||
|
||||
const route = useRoute()
|
||||
|
||||
const isActive = computed(() => {
|
||||
if (props.exact) {
|
||||
return route.path === props.to
|
||||
}
|
||||
return route.path === props.to || route.path.startsWith(props.to + '/')
|
||||
})
|
||||
|
||||
const activeClass = computed(() => {
|
||||
if (props.collapsed) {
|
||||
return '!text-primary-500 bg-primary-500/10'
|
||||
|
||||
@@ -48,6 +48,17 @@
|
||||
"logout": "Déconnexion réussie."
|
||||
}
|
||||
},
|
||||
"logs": {
|
||||
"docker": "Logs Docker",
|
||||
"symfony": "Logs Symfony",
|
||||
"lines": "Lignes",
|
||||
"level": "Niveau",
|
||||
"levelAll": "Tous",
|
||||
"refresh": "Actualiser",
|
||||
"noContent": "Aucun log disponible",
|
||||
"copy": "Copier les logs",
|
||||
"title": "Logs"
|
||||
},
|
||||
"dashboard": {
|
||||
"title": "Dashboard",
|
||||
"description": "Vue d'ensemble du SI",
|
||||
@@ -56,7 +67,8 @@
|
||||
"running": "En ligne",
|
||||
"exited": "Arrete",
|
||||
"restarting": "Redemarrage",
|
||||
"not_found": "Introuvable"
|
||||
"not_found": "Introuvable",
|
||||
"unavailable": "Docker indisponible"
|
||||
}
|
||||
},
|
||||
"applications": {
|
||||
|
||||
@@ -6,6 +6,8 @@ import type { DeployResult } from '~/services/dto/deploy'
|
||||
import { getAvailableTags, deploy } from '~/services/deploy'
|
||||
import type { EnvironmentHealth } from '~/services/dto/dashboard'
|
||||
import { getEnvironmentHealth } from '~/services/dashboard'
|
||||
import type { LogOutput } from '~/services/dto/logs'
|
||||
import { getDockerLogs, getSymfonyLog } from '~/services/logs'
|
||||
|
||||
const { t } = useI18n()
|
||||
const route = useRoute()
|
||||
@@ -29,6 +31,15 @@ const deployResult = ref<DeployResult | null>(null)
|
||||
const healthByEnvId = ref<Record<number, EnvironmentHealth>>({})
|
||||
const loadingHealth = ref(false)
|
||||
|
||||
// Log modals
|
||||
const showLogModal = ref(false)
|
||||
const logContent = ref('')
|
||||
const logLoading = ref(false)
|
||||
const logTitle = ref('')
|
||||
const logEnvId = ref<number | null>(null)
|
||||
const logFileId = ref<number | null>(null)
|
||||
const logIsSymfony = ref(false)
|
||||
|
||||
// App edit modal
|
||||
const showAppModal = ref(false)
|
||||
const editForm = ref<ApplicationWrite>({ name: '', slug: '', registryImage: '', description: '', giteaUrl: '' })
|
||||
@@ -226,6 +237,41 @@ function statusClass(status: string): string {
|
||||
}
|
||||
}
|
||||
|
||||
// Log functions
|
||||
async function openDockerLogs(env: Environment) {
|
||||
logEnvId.value = env.id!
|
||||
logFileId.value = null
|
||||
logIsSymfony.value = false
|
||||
logTitle.value = `${t('logs.docker')} — ${env.name}`
|
||||
logContent.value = ''
|
||||
showLogModal.value = true
|
||||
}
|
||||
|
||||
async function openSymfonyLog(env: Environment, lf: { id?: number, label: string }) {
|
||||
logEnvId.value = env.id!
|
||||
logFileId.value = lf.id!
|
||||
logIsSymfony.value = true
|
||||
logTitle.value = `${t('logs.symfony')} — ${lf.label}`
|
||||
logContent.value = ''
|
||||
showLogModal.value = true
|
||||
}
|
||||
|
||||
async function refreshLogs(lines: number, level: string) {
|
||||
if (!logEnvId.value) return
|
||||
logLoading.value = true
|
||||
try {
|
||||
let result: LogOutput
|
||||
if (logIsSymfony.value && logFileId.value) {
|
||||
result = await getSymfonyLog(logEnvId.value, logFileId.value, lines, level || undefined)
|
||||
} else {
|
||||
result = await getDockerLogs(logEnvId.value, lines)
|
||||
}
|
||||
logContent.value = result.content
|
||||
} finally {
|
||||
logLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const envModalTitle = computed(() =>
|
||||
editingEnvId.value ? t('environments.editButton') : t('environments.addButton')
|
||||
)
|
||||
@@ -334,6 +380,13 @@ onMounted(loadApplication)
|
||||
</a>
|
||||
</div>
|
||||
<div class="flex gap-2">
|
||||
<MalioButton
|
||||
:label="t('logs.docker')"
|
||||
variant="secondary"
|
||||
icon-name="mdi:text-box-outline"
|
||||
icon-position="left"
|
||||
@click="openDockerLogs(env)"
|
||||
/>
|
||||
<MalioButton
|
||||
:label="t('environments.deploy.button')"
|
||||
icon-name="mdi:rocket-launch-outline"
|
||||
@@ -358,9 +411,16 @@ onMounted(loadApplication)
|
||||
<!-- Log files -->
|
||||
<div v-if="env.logFiles.length" class="mt-4 border-t border-neutral-200 pt-3">
|
||||
<p class="text-sm font-bold uppercase tracking-wider mb-2">{{ t('environments.logFiles.title') }}</p>
|
||||
<div v-for="lf in env.logFiles" :key="lf.id" class="text-sm text-neutral-700 flex gap-2">
|
||||
<span class="font-medium">{{ lf.label }} :</span>
|
||||
<div v-for="lf in env.logFiles" :key="lf.id" class="text-sm text-neutral-700 flex gap-2 items-center">
|
||||
<span class="font-medium">{{ lf.label }}</span>
|
||||
<span class="font-mono text-neutral-400">{{ lf.path }}</span>
|
||||
<MalioButtonIcon
|
||||
icon="mdi:console"
|
||||
:aria-label="lf.label"
|
||||
variant="ghost"
|
||||
icon-size="16"
|
||||
@click="openSymfonyLog(env, lf)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -613,5 +673,15 @@ onMounted(loadApplication)
|
||||
/>
|
||||
</template>
|
||||
</AppModal>
|
||||
|
||||
<!-- Log modal -->
|
||||
<LogModal
|
||||
v-model="showLogModal"
|
||||
:title="logTitle"
|
||||
:content="logContent"
|
||||
:loading="logLoading"
|
||||
:show-level-filter="logIsSymfony"
|
||||
@refresh="refreshLogs"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
5
frontend/services/dto/logs.ts
Normal file
5
frontend/services/dto/logs.ts
Normal file
@@ -0,0 +1,5 @@
|
||||
type LogOutput = {
|
||||
content: string
|
||||
lines: number
|
||||
source: string
|
||||
}
|
||||
15
frontend/services/logs.ts
Normal file
15
frontend/services/logs.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
import type { LogOutput } from './dto/logs'
|
||||
|
||||
export function getDockerLogs(envId: number, lines: number = 100): Promise<LogOutput> {
|
||||
return useApi().get<LogOutput>(`/environments/${envId}/logs/docker`, { lines }, {
|
||||
toast: false,
|
||||
})
|
||||
}
|
||||
|
||||
export function getSymfonyLog(envId: number, logFileId: number, lines: number = 100, level?: string): Promise<LogOutput> {
|
||||
const query: Record<string, any> = { lines }
|
||||
if (level) query.level = level
|
||||
return useApi().get<LogOutput>(`/environments/${envId}/logs/symfony/${logFileId}`, query, {
|
||||
toast: false,
|
||||
})
|
||||
}
|
||||
@@ -7,3 +7,4 @@ POSTGRES_USER=root
|
||||
POSTGRES_PASSWORD=root
|
||||
POSTGRES_PORT=5436
|
||||
XDEBUG_CLIENT_HOST=host.docker.internal
|
||||
HOST_APPS_PATH=/home/user/workspace
|
||||
|
||||
31
src/ApiResource/LogOutput.php
Normal file
31
src/ApiResource/LogOutput.php
Normal file
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\ApiResource;
|
||||
|
||||
use ApiPlatform\Metadata\ApiResource;
|
||||
use ApiPlatform\Metadata\Get;
|
||||
use App\State\DockerLogProvider;
|
||||
use App\State\SymfonyLogProvider;
|
||||
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
uriTemplate: '/environments/{id}/logs/docker',
|
||||
security: "is_granted('ROLE_ADMIN')",
|
||||
provider: DockerLogProvider::class,
|
||||
),
|
||||
new Get(
|
||||
uriTemplate: '/environments/{id}/logs/symfony/{logFileId}',
|
||||
security: "is_granted('ROLE_ADMIN')",
|
||||
provider: SymfonyLogProvider::class,
|
||||
),
|
||||
],
|
||||
)]
|
||||
final class LogOutput
|
||||
{
|
||||
public string $content = '';
|
||||
public int $lines = 0;
|
||||
public string $source = '';
|
||||
}
|
||||
@@ -57,21 +57,21 @@ class AppFixtures extends Fixture
|
||||
$sirh->setGiteaUrl('https://gitea.malio.fr/malio-dev/sirh');
|
||||
|
||||
$sirhProd = new Environment();
|
||||
$sirhProd->setName('production');
|
||||
$sirhProd->setContainerName('sirh-app');
|
||||
$sirhProd->setDeployScriptPath('/home/m-tristan/workspace/SIRH/deploy/docker/deploy.sh');
|
||||
$sirhProd->setMaintenanceFilePath('/home/m-tristan/workspace/SIRH/deploy/docker/maintenance.on');
|
||||
$sirhProd->setName('Production');
|
||||
$sirhProd->setContainerName('php-sirh-fpm');
|
||||
$sirhProd->setDeployScriptPath('/SIRH/deploy/docker/deploy.sh');
|
||||
$sirhProd->setMaintenanceFilePath('/SIRH/deploy/docker/maintenance.on');
|
||||
$sirhProd->setAppUrl('http://sirh.malio-dev.fr');
|
||||
$sirh->addEnvironment($sirhProd);
|
||||
|
||||
$sirhProdLog = new LogFile();
|
||||
$sirhProdLog->setLabel('prod');
|
||||
$sirhProdLog->setPath('/home/m-tristan/workspace/SIRH/var/log/prod.log');
|
||||
$sirhProdLog->setLabel('dev');
|
||||
$sirhProdLog->setPath('/SIRH/var/log/dev.log');
|
||||
$sirhProd->addLogFile($sirhProdLog);
|
||||
|
||||
$sirhCronLog = new LogFile();
|
||||
$sirhCronLog->setLabel('cron');
|
||||
$sirhCronLog->setPath('/home/m-tristan/workspace/SIRH/var/log/cron.log');
|
||||
$sirhCronLog->setPath('/SIRH/var/log/cron.log');
|
||||
$sirhProd->addLogFile($sirhCronLog);
|
||||
|
||||
$manager->persist($sirh);
|
||||
@@ -86,8 +86,8 @@ class AppFixtures extends Fixture
|
||||
$lesstimeProd = new Environment();
|
||||
$lesstimeProd->setName('production');
|
||||
$lesstimeProd->setContainerName('lesstime-app');
|
||||
$lesstimeProd->setDeployScriptPath('/home/m-tristan/workspace/lesstime/deploy/docker/deploy.sh');
|
||||
$lesstimeProd->setMaintenanceFilePath('/home/m-tristan/workspace/lesstime/deploy/docker/maintenance.on');
|
||||
$lesstimeProd->setDeployScriptPath('/lesstime/deploy/docker/deploy.sh');
|
||||
$lesstimeProd->setMaintenanceFilePath('/lesstime/deploy/docker/maintenance.on');
|
||||
$lesstimeProd->setAppUrl('http://lesstime.malio-dev.fr');
|
||||
$lesstime->addEnvironment($lesstimeProd);
|
||||
|
||||
@@ -103,16 +103,16 @@ class AppFixtures extends Fixture
|
||||
$inventoryProd = new Environment();
|
||||
$inventoryProd->setName('production');
|
||||
$inventoryProd->setContainerName('inventory-app');
|
||||
$inventoryProd->setDeployScriptPath('/home/m-tristan/workspace/inventory/deploy/docker/deploy.sh');
|
||||
$inventoryProd->setMaintenanceFilePath('/home/m-tristan/workspace/inventory/deploy/docker/maintenance.on');
|
||||
$inventoryProd->setDeployScriptPath('/inventory/deploy/docker/deploy.sh');
|
||||
$inventoryProd->setMaintenanceFilePath('/inventory/deploy/docker/maintenance.on');
|
||||
$inventoryProd->setAppUrl('http://inventory.malio-dev.fr');
|
||||
$inventory->addEnvironment($inventoryProd);
|
||||
|
||||
$inventoryRecette = new Environment();
|
||||
$inventoryRecette->setName('recette');
|
||||
$inventoryRecette->setContainerName('inventory-test-app');
|
||||
$inventoryRecette->setDeployScriptPath('/home/m-tristan/workspace/inventory/deploy/docker/deploy-test.sh');
|
||||
$inventoryRecette->setMaintenanceFilePath('/home/m-tristan/workspace/inventory/deploy/docker/maintenance-test.on');
|
||||
$inventoryRecette->setDeployScriptPath('/inventory/deploy/docker/deploy-test.sh');
|
||||
$inventoryRecette->setMaintenanceFilePath('/inventory/deploy/docker/maintenance-test.on');
|
||||
$inventoryRecette->setAppUrl('http://inventory-test.malio-dev.fr');
|
||||
$inventory->addEnvironment($inventoryRecette);
|
||||
|
||||
|
||||
@@ -8,11 +8,34 @@ use Symfony\Component\Process\Process;
|
||||
|
||||
final class DockerService
|
||||
{
|
||||
private ?bool $dockerAvailable = null;
|
||||
|
||||
private function isDockerAvailable(): bool
|
||||
{
|
||||
if (null === $this->dockerAvailable) {
|
||||
$process = new Process(['which', 'docker']);
|
||||
$process->setTimeout(5);
|
||||
$process->run();
|
||||
$this->dockerAvailable = $process->isSuccessful();
|
||||
}
|
||||
|
||||
return $this->dockerAvailable;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array{status: string, image: string, version: string, startedAt: string}
|
||||
*/
|
||||
public function getContainerStatus(string $containerName): array
|
||||
{
|
||||
if (!$this->isDockerAvailable()) {
|
||||
return [
|
||||
'status' => 'unavailable',
|
||||
'image' => '',
|
||||
'version' => '',
|
||||
'startedAt' => '',
|
||||
];
|
||||
}
|
||||
|
||||
$process = new Process([
|
||||
'docker', 'inspect',
|
||||
'--format', '{{.State.Status}}||{{.Config.Image}}||{{.State.StartedAt}}',
|
||||
@@ -60,6 +83,15 @@ final class DockerService
|
||||
*/
|
||||
public function getContainerStats(string $containerName): array
|
||||
{
|
||||
if (!$this->isDockerAvailable()) {
|
||||
return [
|
||||
'cpuPercent' => 0.0,
|
||||
'memoryUsage' => '',
|
||||
'memoryLimit' => '',
|
||||
'memoryPercent' => 0.0,
|
||||
];
|
||||
}
|
||||
|
||||
$process = new Process([
|
||||
'docker', 'stats', '--no-stream',
|
||||
'--format', '{{.CPUPerc}}||{{.MemUsage}}||{{.MemPerc}}',
|
||||
|
||||
113
src/Service/LogService.php
Normal file
113
src/Service/LogService.php
Normal file
@@ -0,0 +1,113 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Service;
|
||||
|
||||
use Symfony\Component\Process\Process;
|
||||
|
||||
final readonly class LogService
|
||||
{
|
||||
public function __construct(
|
||||
private AppPathResolver $pathResolver,
|
||||
) {}
|
||||
|
||||
public function getDockerLogs(string $containerName, int $lines = 100, ?string $since = null): string
|
||||
{
|
||||
$check = new Process(['which', 'docker']);
|
||||
$check->setTimeout(5);
|
||||
$check->run();
|
||||
|
||||
if (!$check->isSuccessful()) {
|
||||
return 'Docker CLI is not available in this environment.';
|
||||
}
|
||||
|
||||
$args = ['docker', 'logs', '--tail', (string) $lines];
|
||||
|
||||
if (null !== $since) {
|
||||
$args[] = '--since';
|
||||
$args[] = $since;
|
||||
}
|
||||
|
||||
$args[] = $containerName;
|
||||
|
||||
$process = new Process($args);
|
||||
$process->setTimeout(10);
|
||||
$process->run();
|
||||
|
||||
return $process->getOutput() . $process->getErrorOutput();
|
||||
}
|
||||
|
||||
public function getSymfonyLog(string $relativePath, int $lines = 100, ?string $level = null): string
|
||||
{
|
||||
$path = $this->pathResolver->resolve($relativePath);
|
||||
|
||||
if (!file_exists($path)) {
|
||||
return sprintf('Log file not found: %s', $path);
|
||||
}
|
||||
|
||||
// Read more lines than requested to compensate for filtering
|
||||
$readLines = (null !== $level && '' !== $level) ? $lines * 5 : $lines;
|
||||
|
||||
$process = new Process(['tail', '-n', (string) $readLines, $path]);
|
||||
$process->setTimeout(10);
|
||||
$process->run();
|
||||
|
||||
$rawLines = explode("\n", trim($process->getOutput()));
|
||||
$formatted = [];
|
||||
|
||||
foreach ($rawLines as $line) {
|
||||
if ('' === $line) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$parsed = $this->parseSymfonyLogLine($line);
|
||||
|
||||
if (null === $parsed) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Skip noisy channels
|
||||
if ('doctrine' === $parsed['channel']) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (null !== $level && '' !== $level && !str_contains(strtoupper($parsed['level']), strtoupper($level))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$formatted[] = sprintf('[%s] %s.%s: %s', $parsed['date'], $parsed['channel'], $parsed['level'], $parsed['message']);
|
||||
}
|
||||
|
||||
// Keep only the last N lines after filtering
|
||||
$formatted = \array_slice($formatted, -$lines);
|
||||
|
||||
return implode("\n", $formatted);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array{date: string, level: string, channel: string, message: string}|null
|
||||
*/
|
||||
private function parseSymfonyLogLine(string $line): ?array
|
||||
{
|
||||
// Standard Symfony monolog format: [2026-04-03T15:33:19.304937+02:00] channel.LEVEL: message {context} []
|
||||
if (preg_match('/^\[([^\]]+)\]\s+(\w+)\.(\w+):\s+(.+)$/', $line, $matches)) {
|
||||
$date = substr($matches[1], 0, 19); // Trim to YYYY-MM-DDTHH:MM:SS
|
||||
$message = $matches[4];
|
||||
|
||||
// Remove JSON context at the end: {"key":"value"} []
|
||||
$message = preg_replace('/\s*\{.*\}\s*\[\]\s*$/', '', $message) ?? $message;
|
||||
// Remove trailing []
|
||||
$message = preg_replace('/\s*\[\]\s*$/', '', $message) ?? $message;
|
||||
|
||||
return [
|
||||
'date' => str_replace('T', ' ', $date),
|
||||
'level' => $matches[3],
|
||||
'channel' => $matches[2],
|
||||
'message' => $message,
|
||||
];
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
49
src/State/DockerLogProvider.php
Normal file
49
src/State/DockerLogProvider.php
Normal file
@@ -0,0 +1,49 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\State;
|
||||
|
||||
use ApiPlatform\Metadata\Operation;
|
||||
use ApiPlatform\State\ProviderInterface;
|
||||
use App\ApiResource\LogOutput;
|
||||
use App\Repository\EnvironmentRepository;
|
||||
use App\Service\LogService;
|
||||
use Symfony\Component\HttpFoundation\RequestStack;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
|
||||
final readonly class DockerLogProvider implements ProviderInterface
|
||||
{
|
||||
public function __construct(
|
||||
private EnvironmentRepository $environmentRepository,
|
||||
private LogService $logService,
|
||||
private RequestStack $requestStack,
|
||||
) {}
|
||||
|
||||
public function provide(Operation $operation, array $uriVariables = [], array $context = []): LogOutput
|
||||
{
|
||||
$id = $uriVariables['id'] ?? null;
|
||||
$environment = $id ? $this->environmentRepository->find($id) : null;
|
||||
|
||||
if (null === $environment) {
|
||||
throw new NotFoundHttpException(sprintf('Environment "%s" not found.', $id));
|
||||
}
|
||||
|
||||
$request = $this->requestStack->getCurrentRequest();
|
||||
$lines = (int) ($request?->query->get('lines', '100') ?? 100);
|
||||
$since = $request?->query->get('since');
|
||||
|
||||
$content = $this->logService->getDockerLogs(
|
||||
$environment->getContainerName(),
|
||||
$lines,
|
||||
$since,
|
||||
);
|
||||
|
||||
$dto = new LogOutput();
|
||||
$dto->content = $content;
|
||||
$dto->lines = $lines;
|
||||
$dto->source = sprintf('docker:%s', $environment->getContainerName());
|
||||
|
||||
return $dto;
|
||||
}
|
||||
}
|
||||
57
src/State/SymfonyLogProvider.php
Normal file
57
src/State/SymfonyLogProvider.php
Normal file
@@ -0,0 +1,57 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\State;
|
||||
|
||||
use ApiPlatform\Metadata\Operation;
|
||||
use ApiPlatform\State\ProviderInterface;
|
||||
use App\ApiResource\LogOutput;
|
||||
use App\Repository\EnvironmentRepository;
|
||||
use App\Repository\LogFileRepository;
|
||||
use App\Service\LogService;
|
||||
use Symfony\Component\HttpFoundation\RequestStack;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
|
||||
final readonly class SymfonyLogProvider implements ProviderInterface
|
||||
{
|
||||
public function __construct(
|
||||
private EnvironmentRepository $environmentRepository,
|
||||
private LogFileRepository $logFileRepository,
|
||||
private LogService $logService,
|
||||
private RequestStack $requestStack,
|
||||
) {}
|
||||
|
||||
public function provide(Operation $operation, array $uriVariables = [], array $context = []): LogOutput
|
||||
{
|
||||
$envId = $uriVariables['id'] ?? null;
|
||||
$logFileId = $uriVariables['logFileId'] ?? null;
|
||||
|
||||
$environment = $envId ? $this->environmentRepository->find($envId) : null;
|
||||
if (null === $environment) {
|
||||
throw new NotFoundHttpException(sprintf('Environment "%s" not found.', $envId));
|
||||
}
|
||||
|
||||
$logFile = $logFileId ? $this->logFileRepository->find($logFileId) : null;
|
||||
if (null === $logFile || $logFile->getEnvironment()?->getId() !== $environment->getId()) {
|
||||
throw new NotFoundHttpException(sprintf('Log file "%s" not found.', $logFileId));
|
||||
}
|
||||
|
||||
$request = $this->requestStack->getCurrentRequest();
|
||||
$lines = (int) ($request?->query->get('lines', '100') ?? 100);
|
||||
$level = $request?->query->get('level');
|
||||
|
||||
$content = $this->logService->getSymfonyLog(
|
||||
$logFile->getPath(),
|
||||
$lines,
|
||||
$level,
|
||||
);
|
||||
|
||||
$dto = new LogOutput();
|
||||
$dto->content = $content;
|
||||
$dto->lines = $lines;
|
||||
$dto->source = sprintf('symfony:%s', $logFile->getLabel());
|
||||
|
||||
return $dto;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user