Merge branch 'master' into newmc

Conflicts:
	app.psgi
	log.conf

diff --git a/app.psgi b/app.psgi
index eee1ad7b69211a6afa50e1d444c6a6c1ded1957f..b5fd756387632198ebf89e3cae6e8bacd0aada7f 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -9,7 +9,6 @@ use Plack::Util;
 use Log::Log4perl;
 
 use constant AUTH_TIMEOUT => 5 * 60;
-use constant ACCESSLOG_FORMAT => '%{X-Forwarded-For}i %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"';
 
 sub CONTENT_SECURITY_POLICY () {
        my $csp = <<CSP;
@@ -52,12 +51,10 @@ sub add_headers {
 }
 
 Log::Log4perl->init_once('log.conf');
-my $access_logger = Log::Log4perl->get_logger('access');
 $ENV{DBIC_NULLABLE_KEY_NOWARN} = 1;
 
 builder {
        enable_if { $_[0]->{PATH_INFO} eq '/ok' } sub { sub{ [200, [], []] }};
-       enable 'AccessLog', format => ACCESSLOG_FORMAT, logger => sub { $access_logger->info(@_) };
        enable 'ContentLength';
        enable \&add_headers;
        enable 'Static', path => qr,^/static/,;

diff --git a/log.conf b/log.conf
index a0f2bdab500841236d09de84174d51898b901345..dbde8c99849fd272e94c9eb7ee599934edcd195f 100644 (file)
--- a/log.conf
+++ b/log.conf
@@ -1,11 +1,5 @@
 log4perl.category. = TRACE, stderr
-log4perl.category.access = INFO, accesslog
 
 log4perl.appender.stderr                          = Log::Log4perl::Appender::Screen
 log4perl.appender.stderr.layout                   = Log::Log4perl::Layout::PatternLayout
 log4perl.appender.stderr.layout.ConversionPattern = [%d] [%F{1}:%M{1}:%L] [%p] %m%n
-
-log4perl.appender.accesslog                          = Log::Log4perl::Appender::File
-log4perl.appender.accesslog.filename                 = /var/log/accesslog
-log4perl.appender.accesslog.layout                   = Log::Log4perl::Layout::PatternLayout
-log4perl.appender.accesslog.layout.ConversionPattern = %m%n