Revert "server: use to_app"

This reverts commit 29bc33e. trying to isolate a restart issue (temp. reverting suspicious commits)
metacpan · Aug 15, 2016 · 183223d · 183223d
1 parent 8c1c59c
commit 183223d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/app.psgi b/app.psgi
@@ -4,7 +4,6 @@ use warnings;
 use FindBin;
 use lib "$FindBin::RealBin/lib";
 use Catalyst::Middleware::Stash 'stash';
-use MetaCPAN::Server;
 
 if ( $ENV{PLACK_ENV} eq 'development' ) {
 
@@ -15,5 +14,5 @@ if ( $ENV{PLACK_ENV} eq 'development' ) {
     }
 }
 
-MetaCPAN::Server->to_app;
-
+# The class has the Plack initialization and returns the app.
+require MetaCPAN::Server;
diff --git a/lib/MetaCPAN/Server.pm b/lib/MetaCPAN/Server.pm
@@ -117,6 +117,5 @@ sub to_app {
     return $app;
 }
 
-1;
-
-__END__
+# Let's be explicit because implicit returns can be confusing
+return $app;
diff --git a/t/lib/MetaCPAN/Server/Test.pm b/t/lib/MetaCPAN/Server/Test.pm
@@ -6,7 +6,6 @@ use warnings;
 use HTTP::Request::Common qw(POST GET DELETE);
 use Plack::Test;
 use Test::More;
-use MetaCPAN::Server;
 
 use base 'Exporter';
 our @EXPORT = qw(
@@ -22,7 +21,7 @@ my $app;
 sub _load_app {
 
     # Delay loading.
-    $app ||= MetaCPAN::Server->to_app;
+    $app ||= require MetaCPAN::Server;
 }
 
 sub prepare_user_test_data {