Move the Net::Server arg parsing into Plack::Handler::Starman, for sc…

…riptability purposes. References GH Issue #109.
miyagawa · Feb 18, 2015 · 357e6c4 · 357e6c4
1 parent b7be0da
commit 357e6c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/Plack/Handler/Starman.pm b/lib/Plack/Handler/Starman.pm
@@ -15,6 +15,13 @@ sub run {
         @Starman::Server::ISA = qw(Net::Server::SS::PreFork); # Yikes.
     }
 
+    # parse Net::Server args that we want to go down the chain
+    foreach my $opt ( keys %$self ) {
+        next unless $opt =~ /^net_server_(\w++)/;
+        my $nsopt = $1;
+        $self->{net_server_args}->{$nsopt} = $self->{$opt};
+    }
+
     Starman::Server->new->run($app, {%$self});
 }
 

diff --git a/lib/Starman/Server.pm b/lib/Starman/Server.pm
@@ -34,12 +34,8 @@ sub run {
     $self->{options} = $options;
 
     my %extra = ();
-
-    # grab any parameters intended for Net::Server
-    foreach my $opt ( keys %$options ) {
-        next unless $opt =~ /^net_server_(\w++)/;
-        my $nsopt = $1;
-        $extra{$nsopt} = $options->{$opt};
+    if(defined($options->{net_server_args})) {
+        %extra = %{ $options->{net_server_args} };
     }
 
     if ( $options->{pid} ) {