Skip to content

Commit

Permalink
Merge pull request #1800 from metacpan/log4perl
Browse files Browse the repository at this point in the history 
use Log::Log4perl for logging
  • Loading branch information
@haarg
haarg committed Nov 19, 2016
2 parents a70eb29 + 4e59931 commit 58542a6
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 10 deletions.
6 changes: 5 additions & 1 deletion app.psgi
View file
Expand Up @@ -14,7 +14,6 @@ my $dev_mode;
BEGIN {
$root_dir = File::Basename::dirname(__FILE__);
$dev_mode = $ENV{PLACK_ENV} && $ENV{PLACK_ENV} eq 'development';
$dev_mode and require Carp::Always;
}

BEGIN {
Expand All @@ -30,6 +29,11 @@ use File::Path ();
use MetaCPAN::Web;
use Plack::Builder;

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

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

# explicitly call ->to_app on every Plack::App::* for performance
Expand Down
3 changes: 2 additions & 1 deletion cpanfile
View file
@@ -1,4 +1,3 @@
requires 'Carp::Always';
requires 'AnyEvent::Curl::Multi';
requires 'CHI';
requires 'CPAN::Changes', '0.21';
Expand Down Expand Up @@ -27,6 +26,7 @@ requires 'Data::Printer', '0.38';
requires 'DateTime', '1.24';
requires 'DateTime::Format::HTTP';
requires 'DateTime::Format::ISO8601';
requires 'Devel::Confess';
requires 'Digest::MD5';
requires 'Digest::SHA1';
requires 'Search::Elasticsearch', '== 2.03';
Expand All @@ -50,6 +50,7 @@ requires 'JavaScript::Minifier::XS';
requires 'List::AllUtils';
requires 'List::MoreUtils';
requires 'List::Util';
requires 'Log::Log4perl::Catalyst';
requires 'Locale::Country','3.28';
requires 'Module::Build::Tiny', '0.037';
requires 'Module::Runtime';
Expand Down
78 changes: 71 additions & 7 deletions cpanfile.snapshot
View file
Expand Up @@ -264,13 +264,6 @@ DISTRIBUTIONS
perl 5.006
strict 0
warnings 0
Carp-Always-0.13
pathname: F/FE/FERREIRA/Carp-Always-0.13.tar.gz
provides:
Carp::Always 0.13
requirements:
Carp 0
ExtUtils::MakeMaker 0
Carp-Assert-0.21
pathname: N/NE/NEILB/Carp-Assert-0.21.tar.gz
provides:
Expand Down Expand Up @@ -1535,6 +1528,18 @@ DISTRIBUTIONS
Test::Requires 0
parent 0
perl 5.008001
Devel-Confess-0.009003
pathname: H/HA/HAARG/Devel-Confess-0.009003.tar.gz
provides:
Devel::Confess 0.009003
Devel::Confess::Builtin 0.009003
Devel::Confess::Source undef
Devel::Confess::_Util undef
requirements:
Carp 0
ExtUtils::MakeMaker 0
Scalar::Util 0
perl 5.006
Devel-GlobalDestruction-0.13
pathname: H/HA/HAARG/Devel-GlobalDestruction-0.13.tar.gz
provides:
Expand Down Expand Up @@ -2450,6 +2455,65 @@ DISTRIBUTIONS
perl 5.008001
strict 0
warnings 0
Log-Log4perl-1.48
pathname: M/MS/MSCHILLI/Log-Log4perl-1.48.tar.gz
provides:
L4pResurrectable 0.01
Log::Log4perl 1.48
Log::Log4perl::Appender undef
Log::Log4perl::Appender::Buffer undef
Log::Log4perl::Appender::DBI undef
Log::Log4perl::Appender::File undef
Log::Log4perl::Appender::Limit undef
Log::Log4perl::Appender::RRDs undef
Log::Log4perl::Appender::Screen undef
Log::Log4perl::Appender::ScreenColoredLevels undef
Log::Log4perl::Appender::Socket undef
Log::Log4perl::Appender::String undef
Log::Log4perl::Appender::Synchronized undef
Log::Log4perl::Appender::TestArrayBuffer undef
Log::Log4perl::Appender::TestBuffer undef
Log::Log4perl::Appender::TestFileCreeper undef
Log::Log4perl::Catalyst undef
Log::Log4perl::Config undef
Log::Log4perl::Config::BaseConfigurator undef
Log::Log4perl::Config::DOMConfigurator 0.03
Log::Log4perl::Config::PropertyConfigurator undef
Log::Log4perl::Config::Watch undef
Log::Log4perl::DateFormat undef
Log::Log4perl::Filter undef
Log::Log4perl::Filter::Boolean undef
Log::Log4perl::Filter::LevelMatch undef
Log::Log4perl::Filter::LevelRange undef
Log::Log4perl::Filter::MDC undef
Log::Log4perl::Filter::StringMatch undef
Log::Log4perl::InternalDebug undef
Log::Log4perl::JavaMap undef
Log::Log4perl::JavaMap::ConsoleAppender undef
Log::Log4perl::JavaMap::FileAppender undef
Log::Log4perl::JavaMap::JDBCAppender undef
Log::Log4perl::JavaMap::NTEventLogAppender undef
Log::Log4perl::JavaMap::RollingFileAppender undef
Log::Log4perl::JavaMap::SyslogAppender undef
Log::Log4perl::JavaMap::TestBuffer undef
Log::Log4perl::Layout undef
Log::Log4perl::Layout::NoopLayout undef
Log::Log4perl::Layout::PatternLayout undef
Log::Log4perl::Layout::PatternLayout::Multiline undef
Log::Log4perl::Layout::SimpleLayout undef
Log::Log4perl::Level undef
Log::Log4perl::Logger undef
Log::Log4perl::MDC undef
Log::Log4perl::NDC undef
Log::Log4perl::Resurrector undef
Log::Log4perl::Util undef
Log::Log4perl::Util::Semaphore undef
Log::Log4perl::Util::TimeTracker undef
requirements:
ExtUtils::MakeMaker 0
File::Path 2.0606
File::Spec 0.82
Test::More 0.45
MCE-1.708
pathname: M/MA/MARIOROY/MCE-1.708.tar.gz
provides:
Expand Down
17 changes: 16 additions & 1 deletion lib/MetaCPAN/Web.pm
View file
Expand Up @@ -10,7 +10,8 @@ use Catalyst qw/
Static::Simple
Authentication
+MetaCPAN::Role::Fastly::Catalyst
/;
/, '-Log=warn,error,fatal';
use Log::Log4perl::Catalyst;

extends 'Catalyst';

Expand Down Expand Up @@ -46,6 +47,20 @@ 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
}
)
);

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

Expand Down
2 changes: 2 additions & 0 deletions lib/MetaCPAN/Web/Controller/Root.pm
View file
Expand Up @@ -27,6 +27,8 @@ sub auto : Private {
if ( my $token = $c->token ) {
$c->authenticate( { token => $token } );
}
Log::Log4perl::MDC->put( "ip", $c->req->address );
Log::Log4perl::MDC->put( "url", $c->req->uri . '' );
return 1;
}

Expand Down

0 comments on commit 58542a6

Please sign in to comment.