Move everything back out into the scriptrole, allow the scripts to force their engine..

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Engine.pm

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index c8e9c7c..62dc3bc 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -750,9 +750,9 @@ Start the engine. Implemented by the various engine classes.
 =cut
 
 sub run {
-    my ($self, $app, @args) = @_;
+    my ($self, $app, $server, @args) = @_;
     # FIXME - Do something sensible with the options we're passed
-    $self->_run_psgi_app($self->_build_psgi_app($app, @args), @args);
+    $server->run($self->_build_psgi_app($app, @args));
 }
 
 sub _build_psgi_app {
@@ -781,12 +781,6 @@ sub _build_psgi_app {
     return $psgi_app;
 }
 
-sub _run_psgi_app {
-    my ($self, $psgi_app, @args) = @_;
-    # FIXME - Need to be able to specify engine and pass options..
-    Plack::Loader->auto(port => $args[0])->run($psgi_app);
-}
-
 =head2 $self->write($c, $buffer)
 
 Writes the buffer to the client.