Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
configurable log4perl
  • Loading branch information
haarg committed Nov 19, 2016
1 parent 2e10399 commit e7aed04
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 19 deletions.
29 changes: 24 additions & 5 deletions app.psgi
Expand Up @@ -28,12 +28,36 @@ use Config::JFDI;
use File::Path ();
use MetaCPAN::Web;
use Plack::Builder;
use Log::Contextual qw(set_logger);
use Log::Log4perl;
use File::Spec;

BEGIN {
$SIG{__WARN__} = sub { MetaCPAN::Web->log->warn(@_) };
$dev_mode and require Devel::Confess and Devel::Confess->import;
}

set_logger(Log::Log4perl->get_logger);

my $config = Config::JFDI->new(
name => 'MetaCPAN::Web',
path => $root_dir,
);
if (my $log_config = $config->get->{log4perl_file}) {
Log::Log4perl::init(File::Spec->rel2abs($config->get->{log4perl_file}, $root_dir));
}
else {
Log::Log4perl::init(\q{
log4perl.rootLogger=DEBUG, OUTPUT
log4perl.appender.OUTPUT=Log::Log4perl::Appender::Screen
log4perl.appender.OUTPUT.stderr=1
log4perl.appender.OUTPUT.layout=PatternLayout
log4perl.appender.OUTPUT.layout.ConversionPattern=[%d] [%p] [%X{url}] %m%n
});
}

my $tempdir = "$root_dir/var/tmp";

# explicitly call ->to_app on every Plack::App::* for performance
Expand All @@ -60,11 +84,6 @@ builder {
);

builder {
my $config = Config::JFDI->new(
name => 'MetaCPAN::Web',
path => $root_dir,
);

die 'cookie_secret not configured'
unless $config->get->{cookie_secret};

Expand Down
1 change: 1 addition & 0 deletions cpanfile
Expand Up @@ -50,6 +50,7 @@ requires 'JavaScript::Minifier::XS';
requires 'List::AllUtils';
requires 'List::MoreUtils';
requires 'List::Util';
requires 'Log::Contextual';
requires 'Log::Log4perl::Catalyst';
requires 'Locale::Country','3.28';
requires 'Module::Build::Tiny', '0.037';
Expand Down
70 changes: 70 additions & 0 deletions cpanfile.snapshot
Expand Up @@ -932,6 +932,15 @@ DISTRIBUTIONS
Symbol 0
Test 0
perl 5.006
Data-Dumper-Concise-2.022
pathname: F/FR/FREW/Data-Dumper-Concise-2.022.tar.gz
provides:
Data::Dumper::Concise 2.022
Data::Dumper::Concise::Sugar undef
Devel::Dwarn undef
requirements:
ExtUtils::MakeMaker 6.59
perl 5.006
Data-OptList-0.110
pathname: R/RJ/RJBS/Data-OptList-0.110.tar.gz
provides:
Expand Down Expand Up @@ -1672,6 +1681,26 @@ DISTRIBUTIONS
perl 5.008001
strict 0
warnings 0
Exporter-Declare-0.114
pathname: E/EX/EXODIST/Exporter-Declare-0.114.tar.gz
provides:
Exporter::Declare 0.114
Exporter::Declare::Export undef
Exporter::Declare::Export::Alias undef
Exporter::Declare::Export::Generator undef
Exporter::Declare::Export::Sub undef
Exporter::Declare::Export::Variable undef
Exporter::Declare::Meta undef
Exporter::Declare::Specs undef
requirements:
Carp 0
Fennec::Lite 0.004
Meta::Builder 0.003
Scalar::Util 0
Test::Exception 0.29
Test::Simple 0.88
aliased 0
perl v5.8.0
Exporter-Lite-0.08
pathname: N/NE/NEILB/Exporter-Lite-0.08.tar.gz
provides:
Expand Down Expand Up @@ -1742,6 +1771,15 @@ DISTRIBUTIONS
Test::More 0
URI 0
perl 5.008001
Fennec-Lite-0.004
pathname: E/EX/EXODIST/Fennec-Lite-0.004.tar.gz
provides:
Fennec::Lite 0.004
requirements:
List::Util 0
Test::Builder 0
Test::More 0
perl 5.006
File-HomeDir-1.00
pathname: A/AD/ADAMK/File-HomeDir-1.00.tar.gz
provides:
Expand Down Expand Up @@ -2455,6 +2493,27 @@ DISTRIBUTIONS
perl 5.008001
strict 0
warnings 0
Log-Contextual-0.007000
pathname: F/FR/FREW/Log-Contextual-0.007000.tar.gz
provides:
Log::Contextual 0.007000
Log::Contextual::Easy::Default 0.007000
Log::Contextual::Easy::Package 0.007000
Log::Contextual::Role::Router 0.007000
Log::Contextual::Role::Router::HasLogger 0.007000
Log::Contextual::Role::Router::SetLogger 0.007000
Log::Contextual::Role::Router::WithLogger 0.007000
Log::Contextual::Router 0.007000
Log::Contextual::SimpleLogger 0.007000
Log::Contextual::TeeLogger 0.007000
Log::Contextual::WarnLogger 0.007000
requirements:
Carp 0
Data::Dumper::Concise 0
Exporter::Declare 0.111
ExtUtils::MakeMaker 0
Moo 1.003
Scalar::Util 0
Log-Log4perl-1.48
pathname: M/MS/MSCHILLI/Log-Log4perl-1.48.tar.gz
provides:
Expand Down Expand Up @@ -2578,6 +2637,17 @@ DISTRIBUTIONS
ExtUtils::MakeMaker 6.59
Test::More 0.47
perl 5.006
Meta-Builder-0.003
pathname: E/EX/EXODIST/Meta-Builder-0.003.tar.gz
provides:
Meta::Builder 0.003
Meta::Builder::Base undef
Meta::Builder::Util undef
requirements:
Carp 0
Fennec::Lite 0
Test::Exception 0
Test::More 0
MetaCPAN-Moose-0.000002
pathname: M/MI/MICKEY/MetaCPAN-Moose-0.000002.tar.gz
provides:
Expand Down
15 changes: 1 addition & 14 deletions lib/MetaCPAN/Web.pm
Expand Up @@ -47,20 +47,7 @@ sub token {
shift->request->session->get('token');
}

__PACKAGE__->log(
Log::Log4perl::Catalyst->new(
\q{
log4perl.rootLogger=DEBUG, OUTPUT
log4perl.appender.OUTPUT=Log::Log4perl::Appender::Screen
log4perl.appender.OUTPUT.stderr=1
log4perl.appender.OUTPUT.layout=PatternLayout
log4perl.appender.OUTPUT.layout.ConversionPattern=[%d] [%p] [%X{url}] %m%n
},
autoflush => 1,
)
);
__PACKAGE__->log(Log::Log4perl::Catalyst->new(undef, autoflush => 1));

__PACKAGE__->setup();
__PACKAGE__->meta->make_immutable;
Expand Down

0 comments on commit e7aed04

Please sign in to comment.