From c05ccc4f378de0e9f5bf71b4d945df5880ab8506 Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Wed, 20 May 2026 10:37:04 +0200 Subject: [PATCH] =?UTF-8?q?fix(ogcore):=20corregir=20sistema=20journal-pul?= =?UTF-8?q?l=20para=20m=C3=A1quinas=20con=20journal=20activo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - journal-pull@.service: cambio a --split-mode=host con salida a directorio por IP para evitar "header out-of-date" en máquinas con journal muy activo; añadido boot=0 para descargar solo el boot actual y evitar descargar gigabytes de histórico; Restart=always para reconectar tras cierre limpio - DiskLogsAction: adaptado a directorio (--directory) en lugar de fichero (.journal); usa is_dir() en lugar de file_exists() --- etc/systemd/system/journal-pull@.service | 6 +++--- src/Controller/System/DiskLogsAction.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/systemd/system/journal-pull@.service b/etc/systemd/system/journal-pull@.service index b15e956..56de325 100644 --- a/etc/systemd/system/journal-pull@.service +++ b/etc/systemd/system/journal-pull@.service @@ -6,10 +6,10 @@ Wants=network-online.target [Service] User=systemd-journal-remote Group=systemd-journal-remote -ExecStartPre=/bin/sh -c 'f=/var/log/journal/remote/%i.journal; [ -f "$f" ] && journalctl --file="$f" -n 1 --no-pager 2>/dev/null | grep -q "." || rm -f "$f"' -ExecStart=/usr/lib/systemd/systemd-journal-remote --url=http://%i:19531/entries?SYSLOG_IDENTIFIER=ogcore&SYSLOG_IDENTIFIER=oggui&SYSLOG_IDENTIFIER=ogdhcp&SYSLOG_IDENTIFIER=ogboot&SYSLOG_IDENTIFIER=ogrepo-api&SYSLOG_IDENTIFIER=ogrepo-api_DEBUG&SYSLOG_IDENTIFIER=kea-dhcp4&SYSLOG_IDENTIFIER=kea-ctrl-agent&SYSLOG_IDENTIFIER=DhcpLFC&SYSLOG_IDENTIFIER=kea-dhcp6&SYSLOG_IDENTIFIER=tftpd-hpa&SYSLOG_IDENTIFIER=%%28smbd%%29&SYSLOG_IDENTIFIER=%%28nmbd%%29 --split-mode=none --output=/var/log/journal/remote/%i.journal +ExecStartPre=/bin/mkdir -p /var/log/journal/remote/%i +ExecStart=/usr/lib/systemd/systemd-journal-remote --url=http://%i:19531/entries?boot=0&SYSLOG_IDENTIFIER=ogcore&SYSLOG_IDENTIFIER=oggui&SYSLOG_IDENTIFIER=ogdhcp&SYSLOG_IDENTIFIER=ogboot&SYSLOG_IDENTIFIER=ogrepo-api&SYSLOG_IDENTIFIER=ogrepo-api_DEBUG&SYSLOG_IDENTIFIER=kea-dhcp4&SYSLOG_IDENTIFIER=kea-ctrl-agent&SYSLOG_IDENTIFIER=DhcpLFC&SYSLOG_IDENTIFIER=kea-dhcp6&SYSLOG_IDENTIFIER=tftpd-hpa&SYSLOG_IDENTIFIER=%%28smbd%%29&SYSLOG_IDENTIFIER=%%28nmbd%%29 --split-mode=host --output=/var/log/journal/remote/%i/ Restart=always -RestartSec=10 +RestartSec=30 [Install] WantedBy=multi-user.target diff --git a/src/Controller/System/DiskLogsAction.php b/src/Controller/System/DiskLogsAction.php index a9b1078..76e01da 100644 --- a/src/Controller/System/DiskLogsAction.php +++ b/src/Controller/System/DiskLogsAction.php @@ -39,15 +39,15 @@ class DiskLogsAction extends AbstractController $args = ['--no-pager', '--output=json', sprintf('-n %d', $lines)]; if ($host) { - // Host remoto: leer del fichero journal nombrado por IP - $journalFile = sprintf('%s/%s.journal', self::REMOTE_JOURNAL_DIR, $host); - if (!file_exists($journalFile)) { + // Host remoto: leer del directorio journal nombrado por IP + $journalDir = sprintf('%s/%s', self::REMOTE_JOURNAL_DIR, $host); + if (!is_dir($journalDir)) { return new JsonResponse( ['error' => sprintf('No se encontró el journal para el host %s', $host)], Response::HTTP_NOT_FOUND ); } - $args[] = sprintf('--file=%s', escapeshellarg($journalFile)); + $args[] = sprintf('--directory=%s', escapeshellarg($journalDir)); } // Múltiples SYSLOG_IDENTIFIER se pasan como matches separados → journalctl los aplica con OR -- 2.40.1