Undo change in Mojo::UserAgent::Server.

We can instead adapt the start() method of Mojo::Server::Daemon to leave Mojo::UserAgent::Server in pristine state.
mojolicious · Apr 6, 2021 · d50deba · d50deba
1 parent b12fef3
commit d50deba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -54,6 +54,7 @@ sub start {
   # Start listening
   elsif (!@{$self->acceptors}) {
     $self->app->server($self);
+    $self->app->worker_starting;
     $self->_listen($_) for @{$self->listen};
   }
 

diff --git a/lib/Mojo/UserAgent/Server.pm b/lib/Mojo/UserAgent/Server.pm
@@ -12,16 +12,11 @@ sub app {
 
   # Singleton application
   state $singleton;
-  unless (ref $self) {
-    my $starting = ref $app && (!defined $singleton || $singleton ne $app);
-    $app->worker_starting if $starting;
-    return $singleton = $app ? $app : $singleton;
-  }
+  return $singleton = $app ? $app : $singleton unless ref $self;
 
   # Default to singleton application
   return $self->{app} || $singleton unless $app;
   $self->{app} = $app;
-  $app->worker_starting;
   return $self;
 }
 

diff --git a/t/mojo/daemon.t b/t/mojo/daemon.t
@@ -171,7 +171,10 @@ $app->routes->any(
   }
 );
 
-$app->routes->any('/*whatever' => {text => $whatever});
+$app->routes->any('/*whatever' => sub {
+  my ($c) = shift;
+  $c->render(text => $whatever);
+});
 
 subtest 'Normal request' => sub {
   my $tx = $ua->get('/normal/');