135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#740 --logfiles=8 and --logsize=10 (MB) options to netdisco-backend and netdisco-web

Browse Source
This commit is contained in:
Oliver Gorwits
2020-09-26 12:16:30 +01:00
parent 5839fd4404
commit 72934d394c
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/netdisco-backend
View File

@@ -43,6 +43,15 @@ use Daemon::Control;
use Filesys::Notify::Simple; use Filesys::Notify::Simple;
use File::Copy; use File::Copy;
use Getopt::Long;
Getopt::Long::Configure ("pass_through");
my ($logfiles, $logsize) = (8,10);
my $result = GetOptions(
'logfiles=i' => \$logfiles,
'logsize=i' => \$logsize,
);
use App::Netdisco::Environment; use App::Netdisco::Environment;
my $config = ($ENV{PLACK_ENV} || $ENV{DANCER_ENVIRONMENT}) .'.yml'; my $config = ($ENV{PLACK_ENV} || $ENV{DANCER_ENVIRONMENT}) .'.yml';
@@ -156,13 +165,13 @@ sub rotate_logs {
my $child = shift; my $child = shift;
return unless (-f $log_file) and return unless (-f $log_file) and
((-s $log_file) > (10 * 1024768)); ((-s $log_file) > ($logsize * 1024768));
my @files = glob file($log_dir, '*'); my @files = glob file($log_dir, '*');
foreach my $f (reverse sort @files) { foreach my $f (reverse sort @files) {
next unless $f =~ m/$log_file\.(\d)$/; next unless $f =~ m/$log_file\.(\d)$/;
my $pos = $1; my $pos = $1;
unlink $f if $pos == 7; unlink $f if $pos == ($logfiles - 1);
my $next = $pos + 1; my $next = $pos + 1;
(my $newf = $f) =~ s/\.$pos$/.$next/; (my $newf = $f) =~ s/\.$pos$/.$next/;
rename $f, $newf; rename $f, $newf;

13
bin/netdisco-web
View File

@@ -44,6 +44,15 @@ use Filesys::Notify::Simple;
use IO::File; use IO::File;
use File::Copy; use File::Copy;
use Getopt::Long;
Getopt::Long::Configure ("pass_through");
my ($logfiles, $logsize) = (8,10);
my $result = GetOptions(
'logfiles=i' => \$logfiles,
'logsize=i' => \$logsize,
);
use App::Netdisco::Environment; use App::Netdisco::Environment;
my $config = ($ENV{PLACK_ENV} || $ENV{DANCER_ENVIRONMENT}) .'.yml'; my $config = ($ENV{PLACK_ENV} || $ENV{DANCER_ENVIRONMENT}) .'.yml';
@@ -171,13 +180,13 @@ sub rotate_logs {
my $child = shift; my $child = shift;
return unless (-f $log_file) and return unless (-f $log_file) and
((-s $log_file) > (10 * 1024768)); ((-s $log_file) > ($logsize * 1024768));
my @files = glob file($log_dir, '*'); my @files = glob file($log_dir, '*');
foreach my $f (reverse sort @files) { foreach my $f (reverse sort @files) {
next unless $f =~ m/$log_file\.(\d)$/; next unless $f =~ m/$log_file\.(\d)$/;
my $pos = $1; my $pos = $1;
unlink $f if $pos == 7; unlink $f if $pos == ($logfiles - 1);
my $next = $pos + 1; my $next = $pos + 1;
(my $newf = $f) =~ s/\.$pos$/.$next/; (my $newf = $f) =~ s/\.$pos$/.$next/;
rename $f, $newf; rename $f, $newf;