added tests for SO_REUSEPORT and made servers easier to test

mojolicious · Aug 25, 2013 · 64c758c · 64c758c · OverlordQ · Sep 8, 2013
1 parent f233adc
commit 64c758c
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 9 deletions.
diff --git a/Changes b/Changes
@@ -1,7 +1,11 @@
 
 4.27  2013-08-25
+  - Added acceptors acceptors to Mojo::Server::Daemon.
+  - Added handle method to Mojo::IOLoop::Server.
   - Added reuse option to Mojo::IOLoop::Server::listen.
   - Added reuse parameter to Mojo::Server::Daemon::listen.
+  - Fixed console message bug in Mojo::Server::Daemon.
+  - Fixed SNI bug in online tests.
 
 4.26  2013-08-18
   - Fixed support for Netscape cookies in Mojo::Cookie::Response.

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -103,6 +103,8 @@ sub generate_port {
     ->sockport;
 }
 
+sub handle { shift->{handle} }
+
 sub start {
   my $self = shift;
   weaken $self;
@@ -292,6 +294,12 @@ TLS verification mode, defaults to C<0x03>.
 
 Find a free TCP port, this is a utility function primarily used for tests.
 
+=head2 handle
+
+  my $handle = $server->handle;
+
+Get handle for server.
+
 =head2 start
 
   $server->start;

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -9,6 +9,7 @@ use Scalar::Util 'weaken';
 
 use constant DEBUG => $ENV{MOJO_DAEMON_DEBUG} || 0;
 
+has acceptors => sub { [] };
 has [qw(backlog group silent user)];
 has inactivity_timeout => sub { $ENV{MOJO_INACTIVITY_TIMEOUT} // 15 };
 has ioloop => sub { Mojo::IOLoop->singleton };
@@ -20,7 +21,7 @@ sub DESTROY {
   my $self = shift;
   return unless my $loop = $self->ioloop;
   $self->_remove($_) for keys %{$self->{connections} || {}};
-  $loop->remove($_) for @{$self->{acceptors} || []};
+  $loop->remove($_) for @{$self->acceptors};
 }
 
 sub run {
@@ -54,9 +55,9 @@ sub start {
 
   # Resume accepting connections
   my $loop = $self->ioloop;
-  if (my $acceptors = $self->{acceptors}) {
-    push @$acceptors, $loop->acceptor(delete $self->{servers}{$_})
-      for keys %{$self->{servers}};
+  if (my $servers = $self->{servers}) {
+    push @{$self->acceptors}, $loop->acceptor(delete $servers->{$_})
+      for keys %$servers;
   }
 
   # Start listening
@@ -71,7 +72,7 @@ sub stop {
 
   # Suspend accepting connections but keep listen sockets open
   my $loop = $self->ioloop;
-  while (my $id = shift @{$self->{acceptors}}) {
+  while (my $id = shift @{$self->acceptors}) {
     my $server = $self->{servers}{$id} = $loop->acceptor($id);
     $loop->remove($id);
     $server->stop;
@@ -176,7 +177,7 @@ sub _listen {
   my $tls = $options->{tls} = $url->protocol eq 'https' ? 1 : undef;
 
   weaken $self;
-  push @{$self->{acceptors} ||= []}, $self->ioloop->server(
+  push @{$self->acceptors}, $self->ioloop->server(
     $options => sub {
       my ($loop, $stream, $id) = @_;
 
@@ -314,6 +315,13 @@ L<Mojo::Server::Daemon> inherits all events from L<Mojo::Server>.
 L<Mojo::Server::Daemon> inherits all attributes from L<Mojo::Server> and
 implements the following new ones.
 
+=head2 acceptors
+
+  my $acceptors = $daemon->acceptors;
+  $daemon       = $daemon->acceptors([]);
+
+Currently active acceptors.
+
 =head2 backlog
 
   my $backlog = $daemon->backlog;

diff --git a/t/mojo/app.t b/t/mojo/app.t
@@ -12,6 +12,7 @@ use Mojo::Log;
 use Mojo::Server::Daemon;
 use Mojo::UserAgent;
 use Mojolicious;
+use Socket qw(SO_REUSEPORT SOL_SOCKET);
 
 # Timeout
 {
@@ -219,13 +220,16 @@ $daemon = Mojo::Server::Daemon->new(
   listen => ["http://127.0.0.1:$port"],
   silent => 1
 );
+is_deeply $daemon->acceptors, [], 'no active acceptors';
 $daemon->start;
+is scalar @{$daemon->acceptors}, 1, 'one active acceptor';
 is $daemon->app->moniker, 'mojolicious', 'right moniker';
 $tx = $ua->get("http://127.0.0.1:$port/throttle1" => {Connection => 'close'});
 ok $tx->success, 'successful';
 is $tx->res->code, 200,         'right status';
 is $tx->res->body, 'Whatever!', 'right content';
 $daemon->stop;
+is_deeply $daemon->acceptors, [], 'no active acceptors';
 $tx = $ua->inactivity_timeout(0.5)
   ->get("http://127.0.0.1:$port/throttle2" => {Connection => 'close'});
 ok !$tx->success, 'not successful';
@@ -237,4 +241,26 @@ ok $tx->success, 'successful';
 is $tx->res->code, 200,         'right status';
 is $tx->res->body, 'Whatever!', 'right content';
 
+# SO_REUSEPORT
+SKIP: {
+  skip 'SO_REUSEPORT support required!', 2 unless eval {SO_REUSEPORT};
+
+  $port   = Mojo::IOLoop->generate_port;
+  $daemon = Mojo::Server::Daemon->new(
+    listen => ["http://127.0.0.1:$port"],
+    silent => 1
+  )->start;
+  ok !Mojo::IOLoop->acceptor($daemon->acceptors->[0])
+    ->handle->getsockopt(SOL_SOCKET, SO_REUSEPORT),
+    'no SO_REUSEPORT socket option';
+  $daemon = Mojo::Server::Daemon->new(
+    listen => ["http://127.0.0.1:$port?reuse=1"],
+    silent => 1
+  );
+  $daemon->start;
+  ok !!Mojo::IOLoop->acceptor($daemon->acceptors->[0])
+    ->handle->getsockopt(SOL_SOCKET, SO_REUSEPORT),
+    'SO_REUSEPORT socket option';
+}
+
 done_testing();
diff --git a/t/mojo/user_agent_online.t b/t/mojo/user_agent_online.t
@@ -206,9 +206,15 @@ is $tx->req->url,    'https://ipv6.google.com', 'right url';
 is $tx->res->code,   200,                       'right status';
 
 # HTTPS request that requires SNI
-$tx = $ua->get('https://google.de');
-like $ua->ioloop->stream($tx->connection)
-  ->handle->peer_certificate('commonName'), qr/google\.de/, 'right name';
+SKIP: {
+  skip 'SNI support required!', 1
+    unless IO::Socket::SSL->can('can_client_sni')
+    && IO::Socket::SSL->can_client_sni;
+
+  $tx = $ua->get('https://google.de');
+  like $ua->ioloop->stream($tx->connection)
+    ->handle->peer_certificate('commonName'), qr/google\.de/, 'right name';
+}
 
 # Fresh user agent again
 $ua = Mojo::UserAgent->new;