seo/control
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

터치 패널 정리와 재부팅 원인 기록 보강

Browse Source
This commit is contained in:
seo committed 2026-10-10 07:47:18 +09:00
1 parent 64510e8fe5
commit 11f27e5347
9 files changed
+488 -358
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

public/api.php
+44 -10
View File
@@ -191,18 +191,38 @@ function command_first_line(array $cmd, bool $root = false, int $timeout = 3): s
function log_retention_status(): array
{
$journalDir = '/var/log/journal';
$journalDisk = command_first_line(['/usr/bin/journalctl', '--disk-usage', '--no-pager'], false, 3);
$journalBoots = command_first_line(['/usr/bin/bash', '-lc', 'journalctl --list-boots --no-pager 2>/dev/null | wc -l'], false, 3);
$journalDisk = command_first_line(['/usr/bin/journalctl', '--disk-usage', '--no-pager'], true, 3);
$journalBootResult = sh(['/usr/bin/journalctl', '--list-boots', '--no-pager'], true, 3);
$journalBootLines = (int)$journalBootResult['code'] === 0
? array_values(array_filter(
preg_split('/\R/', trim((string)$journalBootResult['out'])) ?: [],
static fn($line): bool => preg_match('/^\s*-?\d+\s+[0-9a-f]{32}\s+/i', (string)$line) === 1
))
: [];
$pstoreActive = command_first_line(['/usr/bin/systemctl', 'is-active', 'control-pstore-collect.service'], false, 3) ?: 'inactive';
$savedCrashFiles = glob('/var/log/pstore/*') ?: [];
$controlCrashFiles = glob('/var/log/pstore/*') ?: [];
$systemdCrashFiles = glob('/var/lib/systemd/pstore/*') ?: [];
$savedCrashFiles = $controlCrashFiles !== [] ? $controlCrashFiles : $systemdCrashFiles;
$pstoreFiles = glob('/sys/fs/pstore/*') ?: [];
$bootEventPath = '/var/log/control/boot-events.jsonl';
$bootEventLines = is_readable($bootEventPath)
? (file($bootEventPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: [])
: [];
$latestBootEvent = [];
if ($bootEventLines !== []) {
$decoded = json_decode((string)end($bootEventLines), true);
if (is_array($decoded)) {
$latestBootEvent = $decoded;
}
}
$bootCaptureActive = $latestBootEvent !== [] ? 'active' : 'inactive';
return [
'journal' => [
'path' => $journalDir,
'persistent' => is_dir($journalDir),
'disk_usage' => $journalDisk ?: '-',
'boot_count' => is_numeric(trim($journalBoots)) ? (int)trim($journalBoots) : null,
'boot_count' => count($journalBootLines),
'ok' => is_dir($journalDir),
],
'pstore' => [
@@ -210,8 +230,17 @@ function log_retention_status(): array
'collector_active' => $pstoreActive,
'pending_files' => count($pstoreFiles),
'saved_files' => count($savedCrashFiles),
'systemd_saved_files' => count($systemdCrashFiles),
'saved_path' => '/var/log/pstore',
'ok' => is_dir('/sys/fs/pstore'),
'systemd_path' => '/var/lib/systemd/pstore',
'ok' => is_dir('/sys/fs/pstore') && is_dir('/var/lib/systemd/pstore'),
],
'boot_capture' => [
'active' => $bootCaptureActive,
'path' => $bootEventPath,
'count' => count($bootEventLines),
'latest' => $latestBootEvent,
'ok' => $bootCaptureActive === 'active' && is_readable($bootEventPath),
],
];
}
@@ -3408,14 +3437,17 @@ function remember_lan_wol_clients(array $rows): void
foreach ($rows as $row) {
$mac = strtolower((string)($row['mac'] ?? ''));
if (!wifi_valid_mac($mac) || (string)($row['presence'] ?? '') !== 'fdb') {
$ip = (string)($row['ip'] ?? '');
if (!wifi_valid_mac($mac)
|| (string)($row['presence'] ?? '') !== 'fdb'
|| filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false) {
continue;
}
$stmt->execute([
':mac' => $mac,
':iface' => (string)($row['iface'] ?? 'eth1'),
':last_ip' => ($row['ip'] ?? 'N/A') === 'N/A' ? null : (string)$row['ip'],
':last_ip' => $ip,
':hostname' => ($row['hostname'] ?? 'N/A') === 'N/A' ? null : (string)$row['hostname'],
]);
}
@@ -3434,6 +3466,7 @@ function lan_wol_candidate_macs(array $leases, string $iface = 'eth1'): array
SELECT mac
FROM lan_wol_clients
WHERE iface = :iface
AND last_ip IS NOT NULL
ORDER BY last_seen_at DESC
");
$stmt->execute([':iface' => $iface]);
@@ -3441,15 +3474,16 @@ function lan_wol_candidate_macs(array $leases, string $iface = 'eth1'): array
return [];
}
$macs = [];
foreach ($stmt->fetchAll() as $row) {
$mac = strtolower((string)($row['mac'] ?? ''));
if (wifi_valid_mac($mac) && isset($leases[$mac])) {
$macs[$mac] = true;
// eth1 is a dedicated direct-connect PC port. Only its most recently
// observed lease-backed identity should remain as the offline WOL row.
return [$mac];
}
}
return array_keys($macs);
return [];
}
function lan_client_rows(array $leases, array $aliases, array $wifiMacs = [], string $iface = 'eth1'): array