Update for the new Gruntmaster::Data

[plack-app-gruntmaster.git] / app.psgi

diff --git a/app.psgi b/app.psgi
index 53721091fb1bf799c058206d811e4bfc12eaf186..3a6be219ec8fe3f4a5a53a714247e9a8dbdcfa22 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -1,6 +1,6 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 use v5.14;
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+use warnings;
 
 use Gruntmaster::Data;
 use Plack::App::Gruntmaster;
@@ -8,9 +8,6 @@ use Plack::Builder;
 use Plack::Util;
 use Log::Log4perl;
 
-use constant AUTH_TIMEOUT => 5 * 60;
-use constant ACCESSLOG_FORMAT => 'combined';
-
 sub CONTENT_SECURITY_POLICY () {
        my $csp = <<CSP;
 default-src 'none'
@@ -26,15 +23,14 @@ CSP
        $csp =~ s/\n/; /gr;
 }
 
-my $db;
+my $dbinit;
 
 sub add_database {
        my $app = $_[0];
        sub {
-               my ($env) = @_;
-               $db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
-               $env->{'gruntmaster.dbic'} = $db;
-               $app->($env)
+               Gruntmaster::Data::init $ENV{GRUNTMASTER_DSN} // 'dbi:Pg:' unless $dbinit;
+               $dbinit = 1;
+               $app->(@_)
        }
 }
 
@@ -51,12 +47,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/,;