Merge branch 'master' into newmc

diff --git a/app.psgi b/app.psgi
index a4e0c34eca7da9c880ec0ee496a8e24e2be310c9..728e144e4cf0b742cf7f22765925419d51f350e1 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -29,7 +29,7 @@ CSP
        $csp =~ s/\n/; /gr;
 }
 
-our $db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
+my $db;
 
 tie my %auth, 'Tie::Hash::Expire', {expire_seconds => AUTH_TIMEOUT};
 
@@ -42,6 +42,16 @@ sub authenticate {
        $auth{key} = 1;
 }
 
+sub add_database {
+       my $app = $_[0];
+       sub {
+               my ($env) = @_;
+               $db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
+               $env->{'gruntmaster.dbic'} = $db;
+               $app->($env)
+       }
+}
+
 sub add_headers {
        my $app = $_[0];
        sub {
@@ -65,7 +75,7 @@ builder {
        enable \&add_headers;
        enable 'Static', path => qr,^/static/,;
        enable 'Log4perl', category => 'plack';
+       enable \&add_database;
        enable_if { shift->{HTTP_AUTHORIZATION} } 'Auth::Basic', authenticator => \&authenticate, realm => 'Gruntmaster 6000';
-       enable sub { my $app = $_[0]; sub { $_[0]->{'gruntmaster.dbic'} = $db; $app->($_[0]) } };
        Plack::App::Gruntmaster->run_if_script
 }

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index aa473d866c1376d349c722c053329af5a3338232..3a7b9db121302ed83d9dcba510193693050324cb 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -116,7 +116,6 @@ sub dispatch_request{
                },
 
                sub (/robots.txt) { NOT_FOUND },
-               sub (/favicon.ico) { NOT_FOUND },
 
                sub (/src/:job) {
                        return NOT_FOUND if !job;