deprecated Mojo::Server::Daemon->prepare_ioloop in favor of Mojo::Ser…

…ver::Daemon->start
mojolicious · Feb 2, 2012 · aec29f5 · aec29f5
1 parent 83b3b78
commit aec29f5
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 31 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,8 @@
 This file documents the revision history for Perl extension Mojolicious.
 
-2.47    2012-02-01 00:00:00
+2.47    2012-02-02 00:00:00
+        - Deprecated Mojo::Server::Daemon->prepare_ioloop in favor of
+          Mojo::Server::Daemon->start.
         - Added EXPERIMENTAL drain event to Mojo::Content.
         - Added EXPERIMENTAL drain event to Mojo::Transaction::WebSocket.
         - Added EXPERIMENTAL support for RSV1-3 flags to

diff --git a/lib/Mojo/Server.pm b/lib/Mojo/Server.pm
@@ -157,7 +157,7 @@ Load application from script.
 
   $server->run;
 
-Start server.
+Run server.
 
 =head1 SEE ALSO
 

diff --git a/lib/Mojo/Server/CGI.pm b/lib/Mojo/Server/CGI.pm
@@ -158,7 +158,7 @@ implements the following new ones.
 
   $cgi->run;
 
-Process CGI.
+Run CGI.
 
 =head1 SEE ALSO
 

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -50,19 +50,22 @@ EOF
   shift->inactivity_timeout(@_);
 }
 
+# DEPRECATED in Leaf Fluttering In Wind!
 sub prepare_ioloop {
-  my $self = shift;
-  $self->_listen($_) for @{$self->listen || ['http://*:3000']};
-  $self->ioloop->max_connections($self->max_clients);
+  warn <<EOF;
+Mojo::Server::Daemon->prepare_ioloop is DEPRECATED in favor of
+Mojo::Server::Daemon->start!
+EOF
+  shift->start(@_);
 }
 
 # "40 dollars!? This better be the best damn beer ever..
 #  *drinks beer* You got lucky."
 sub run {
   my $self = shift;
 
-  # Prepare ioloop
-  $self->prepare_ioloop;
+  # Start accepting connections
+  $self->start;
 
   # User and group
   $self->setuidgid;
@@ -81,6 +84,12 @@ sub setuidgid {
   return $self;
 }
 
+sub start {
+  my $self = shift;
+  $self->_listen($_) for @{$self->listen || ['http://*:3000']};
+  $self->ioloop->max_connections($self->max_clients);
+}
+
 sub _build_tx {
   my ($self, $id, $c) = @_;
 
@@ -462,24 +471,24 @@ allow WebSocket connections to be inactive indefinitely.
 L<Mojo::Server::Daemon> inherits all methods from L<Mojo::Server> and
 implements the following new ones.
 
-=head2 C<prepare_ioloop>
-
-  $daemon->prepare_ioloop;
-
-Prepare loop.
-
 =head2 C<run>
 
   $daemon->run;
 
-Start server.
+Run server.
 
 =head2 C<setuidgid>
 
   $daemon->setuidgid;
 
 Set user and group for process.
 
+=head2 C<start>
+
+  $daemon->start;
+
+Start accepting connections.
+
 =head1 DEBUGGING
 
 You can set the C<MOJO_DAEMON_DEBUG> environment variable to get some

diff --git a/lib/Mojo/Server/Hypnotoad.pm b/lib/Mojo/Server/Hypnotoad.pm
@@ -83,8 +83,8 @@ sub run {
   # Initiate hot deployment
   $self->_hot_deploy unless $ENV{HYPNOTOAD_PID};
 
-  # Prepare loop
-  $daemon->prepare_ioloop;
+  # Start accepting connections
+  $daemon->start;
 
   # Pipe for worker communication
   pipe($self->{reader}, $self->{writer})
@@ -645,7 +645,7 @@ implements the following new ones.
 
   $toad->run('script/myapp', 'hypnotoad.conf');
 
-Start server.
+Run server.
 
 =head1 DEBUGGING
 

diff --git a/lib/Mojo/Server/Morbo.pm b/lib/Mojo/Server/Morbo.pm
@@ -115,7 +115,7 @@ sub _spawn {
   $daemon->load_app($self->watch->[0]);
   $daemon->silent(1) if $ENV{MORBO_REV} > 1;
   $daemon->listen($self->listen) if @{$self->listen};
-  $daemon->prepare_ioloop;
+  $daemon->start;
   my $loop = $daemon->ioloop;
   $loop->recurring(
     1 => sub { shift->stop if !kill(0, $manager) || $self->{finished} });
@@ -189,7 +189,7 @@ Check if file has been modified since last check.
 
   $morbo->run('script/myapp');
 
-Start server.
+Run server.
 
 =head1 DEBUGGING
 

diff --git a/lib/Mojo/Server/PSGI.pm b/lib/Mojo/Server/PSGI.pm
@@ -127,7 +127,7 @@ implements the following new ones.
 
   my $res = $psgi->run($env);
 
-Start PSGI.
+Run PSGI.
 
 =head1 SEE ALSO
 

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -445,8 +445,7 @@ sub _server {
   my $port = $self->{port} = $loop->generate_port;
   die "Couldn't find a free TCP port for testing.\n" unless $port;
   $self->{scheme} = $scheme ||= 'http';
-  $server->listen(["$scheme://*:$port"]);
-  $server->prepare_ioloop;
+  $server->listen(["$scheme://*:$port"])->start;
   warn "TEST SERVER STARTED ($scheme://*:$port)\n" if DEBUG;
 
   return $server;

diff --git a/lib/Mojolicious/Guides/Cookbook.pod b/lib/Mojolicious/Guides/Cookbook.pod
@@ -235,13 +235,13 @@ into alien environments like foreign event loops.
     $self->render(text => 'Hello World!');
   };
 
-  # Connect application with custom daemon
+  # Connect application with custom daemon and start accepting connections
   my $daemon =
     Mojo::Server::Daemon->new(app => app, listen => ['http://*:8080']);
-  $daemon->prepare_ioloop;
+  $daemon->start;
 
   # Call "one_tick" repeatedly from the alien environment
-  $daemon->ioloop->one_tick while 1;
+  Mojo::IOLoop->one_tick while 1;
 
 =head1 REAL-TIME WEB
 

diff --git a/t/mojo/websocket_proxy.t b/t/mojo/websocket_proxy.t
@@ -50,8 +50,7 @@ my $ua = Mojo::UserAgent->new;
 my $daemon =
   Mojo::Server::Daemon->new(app => app, ioloop => Mojo::IOLoop->singleton);
 my $port = Mojo::IOLoop->new->generate_port;
-$daemon->listen(["http://*:$port"]);
-$daemon->prepare_ioloop;
+$daemon->listen(["http://*:$port"])->start;
 
 # Connect proxy server for testing
 my $proxy = Mojo::IOLoop->generate_port;

diff --git a/t/mojo/websocket_proxy_tls.t b/t/mojo/websocket_proxy_tls.t
@@ -66,8 +66,7 @@ my $daemon =
 my $port   = Mojo::IOLoop->new->generate_port;
 my $listen = "https://*:$port"
   . ':t/mojo/certs/server.crt:t/mojo/certs/server.key:t/mojo/certs/ca.crt';
-$daemon->listen([$listen]);
-$daemon->prepare_ioloop;
+$daemon->listen([$listen])->start;
 
 # Connect proxy server for testing
 my $proxy = Mojo::IOLoop->generate_port;

diff --git a/t/pod_coverage.t b/t/pod_coverage.t
@@ -11,7 +11,8 @@ plan skip_all => 'set TEST_POD to enable this test (developer only!)'
 my @leaf = (
   qw/add_hook comment connect connection_timeout is_done keep_alive_timeout/,
   qw/listen max_redirects on_close on_error on_finish on_lock on_process/,
-  qw/on_read on_unlock port run_hook run_hook_reverse timeout version write/
+  qw/on_read on_unlock port prepare_ioloop run_hook run_hook_reverse/,
+  qw/timeout version write/
 );
 
 # "Marge, I'm going to miss you so much. And it's not just the sex.