Skip to content

Commit

Permalink
Item12023: Add checker for File::Rolling
Browse files Browse the repository at this point in the history
And don't crash if the module is enabled but not available.

git-svn-id: http://svn.foswiki.org/trunk/LogDispatchContrib@15286 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
GeorgeClark authored and GeorgeClark committed Aug 11, 2012
1 parent be16809 commit 2389f65
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 21 deletions.
@@ -0,0 +1,55 @@
# See bottom of file for license and copyright information
package Foswiki::Configure::Checkers::Log::LogDispatch::FileRolling::Enabled;

use strict;
use warnings;

use Foswiki::Configure::Checker ();
our @ISA = ('Foswiki::Configure::Checker');

use Foswiki::Configure::Dependency;

sub check {
my $this = shift;
my $e = '';

my $n = $this->checkPerlModule( 'Log::Dispatch::File::Rolling',
'Required to use FileRolling logging' );
if ( $n =~ m/Not installed/ ) {
$e .=
( $Foswiki::cfg{Log}{LogDispatch}{FileRolling}{Enabled} )
? $this->ERROR($n)
: $this->NOTE($n);
}
else {
$e .= $this->NOTE($n);
}

return $e;
}
1;
__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2008-2012 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Additional copyrights apply to some or all of the code in this
file as follows:
Copyright (C) 2000-2006 TWiki Contributors. All Rights Reserved.
TWiki Contributors are listed in the AUTHORS file in the root
of this distribution. NOTE: Please extend that file, not this notice.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version. For
more details read LICENSE in the root of this distribution.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
As per the GPL, removal of this notice is prohibited.
1 change: 1 addition & 0 deletions lib/Foswiki/Contrib/LogDispatchContrib/MANIFEST
Expand Up @@ -3,3 +3,4 @@ data/System/LogDispatchContrib.txt 0644 Documentation page
lib/Foswiki/Contrib/LogDispatchContrib.pm Perl module
lib/Foswiki/Contrib/LogDispatchContrib/Config.spec 0444 Configuration
lib/Foswiki/Logger/LogDispatch.pm 0444 the logger.
lib/Foswiki/Configure/Checkers/Log/LogDispatch/FileRolling/Enabled.pm 0444
47 changes: 26 additions & 21 deletions lib/Foswiki/Logger/LogDispatch.pm
Expand Up @@ -57,27 +57,32 @@ sub new {
}

if ( $Foswiki::cfg{Log}{LogDispatch}{FileRolling}{Enabled} ) {
use Log::Dispatch::File::Rolling;

my $pattern = $Foswiki::cfg{Log}{LogDispatch}{FileRolling}{Pattern}
|| '-%d{yyyy-MM}.log';

foreach my $file ( keys %LOG2LEVELS ) {
my ( $min_level, $max_level ) = split( /:/, $LOG2LEVELS{$file} );
print STDERR
"File::Rolling: Adding $file as $min_level-$max_level\n"
if TRACE;
$log->add(
Log::Dispatch::File::Rolling->new(
name => 'rolling-' . $file,
min_level => $min_level,
max_level => $max_level,
filename => "$Foswiki::cfg{Log}{Dir}/$file$pattern",
mode => '>>',
binmode => $binmode,
newline => 1
)
);
eval 'use Log::Dispatch::File::Rolling';
if ($@) {
print STDERR "Log::Dispatch::File::Rolling DISABLED\n$@";
}
else {
my $pattern = $Foswiki::cfg{Log}{LogDispatch}{FileRolling}{Pattern}
|| '-%d{yyyy-MM}.log';

foreach my $file ( keys %LOG2LEVELS ) {
my ( $min_level, $max_level ) =
split( /:/, $LOG2LEVELS{$file} );
print STDERR
"File::Rolling: Adding $file as $min_level-$max_level\n"
if TRACE;
$log->add(
Log::Dispatch::File::Rolling->new(
name => 'rolling-' . $file,
min_level => $min_level,
max_level => $max_level,
filename => "$Foswiki::cfg{Log}{Dir}/$file$pattern",
mode => '>>',
binmode => $binmode,
newline => 1
)
);
}
}
}

Expand Down

0 comments on commit 2389f65

Please sign in to comment.