shukivaknin/gniza4cp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show System Backup type in logs page

Browse Source 
Add [TYPE:SYSBACKUP] marker to sysbackup log output. The logs page
detects this in the first 5 lines and displays "System" badge instead
of "Backup".

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
shuki
2026-03-05 18:06:54 +02:00
parent 42ee83f433
commit 6be3e8fabf
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/gniza
View File

@@ -1373,6 +1373,7 @@ cmd_sysbackup() {
load_config "$config_file" load_config "$config_file"
validate_config || die "Invalid configuration" validate_config || die "Invalid configuration"
init_logging init_logging
log_info "[TYPE:SYSBACKUP] System backup started"
local dry_run=false local dry_run=false
has_flag dry-run "$@" && dry_run=true has_flag dry-run "$@" && dry_run=true

21
whm/gniza-whm/logs.cgi
View File

@@ -61,7 +61,7 @@ sub show_list {
name => $entry, name => $entry,
size => $stat[7] // 0, size => $stat[7] // 0,
mtime => $stat[9] // 0, mtime => $stat[9] // 0,
type => ($entry =~ /^cron-/) ? 'Cron' : 'Backup', type => ($entry =~ /^cron-/) ? 'Cron' : _detect_log_type($path),
status => $status, status => $status,
}; };
} }
@@ -96,7 +96,9 @@ sub show_list {
for my $f (@page_files) { for my $f (@page_files) {
my $esc_name = GnizaWHM::UI::esc($f->{name}); my $esc_name = GnizaWHM::UI::esc($f->{name});
my $badge = $f->{type} eq 'Cron' ? 'badge-neutral' : 'badge-info'; my $badge = $f->{type} eq 'Cron' ? 'badge-neutral'
: $f->{type} eq 'System' ? 'badge-warning'
: 'badge-info';
my $date = _format_time($f->{mtime}); my $date = _format_time($f->{mtime});
my $size = _human_size($f->{size}); my $size = _human_size($f->{size});
my $href = 'logs.cgi?file=' . _uri_escape($f->{name}); my $href = 'logs.cgi?file=' . _uri_escape($f->{name});
@@ -321,6 +323,21 @@ sub _valid_log_filename {
return 0; return 0;
} }
sub _detect_log_type {
my ($path) = @_;
if (open my $fh, '<', $path) {
while (my $line = <$fh>) {
if ($line =~ /\[TYPE:SYSBACKUP\]/) {
close $fh;
return 'System';
}
last if $. > 5;
}
close $fh;
}
return 'Backup';
}
sub _detect_log_status { sub _detect_log_status {
my ($path) = @_; my ($path) = @_;
return 'Success' unless -f $path; return 'Success' unless -f $path;