Bug 1437646 - Refactor entrypoint to use Bugzilla::DaemonControl

2 files changed, 32 insertions, 13 deletions

diff --git a/Bugzilla/DaemonControl.pm b/Bugzilla/DaemonControl.pm
index a1c9fd8a5..97ecb84e0 100644
--- a/Bugzilla/DaemonControl.pm
+++ b/Bugzilla/DaemonControl.pm
@@ -79,15 +79,18 @@ sub cereal {
         );
         $loop->add($protocol);
     };
+    my @signals = (
+        catch_signal('TERM', 0),
+        catch_signal('INT', 0 ),
+        catch_signal('KILL', 0 ),
+    );
     $loop->listen(
         host      => '127.0.0.1',
         service   => $ENV{LOGGING_PORT},
         socktype  => 'stream',
         on_stream => $on_stream,
     )->get;
-    kill 'USR1', getppid();
-
-    exit catch_signal('TERM', 0)->get;
+    exit Future->wait_any(@signals)->get;
 }
 
 sub run_cereal {
@@ -99,9 +102,7 @@ sub run_cereal {
         on_exception => on_exception( "cereal", $exit_f ),
     );
     $exit_f->on_cancel( sub { $cereal->kill('TERM') } );
-    my $signal_f = catch_signal('USR1');
     $loop->add($cereal);
-    $signal_f->get;
 
     return $exit_f;
 }
@@ -135,11 +136,16 @@ sub run_cereal_and_httpd {
         push @httpd_args, '-DHTTPS';
     }
     push @httpd_args, '-DNETCAT_LOGS';
-    my $cereal_exit_f = run_cereal();
     my $signal_f      = catch_signal("TERM", 0);
-    my $httpd_exit_f  = run_httpd(@httpd_args);
+    my $cereal_exit_f = run_cereal();
 
-    return Future->wait_any($cereal_exit_f, $httpd_exit_f, $signal_f);
+    return assert_cereal()->then(
+        sub {
+            my $httpd_exit_f  = run_httpd(@httpd_args);
+
+            return Future->wait_any($cereal_exit_f, $httpd_exit_f, $signal_f);
+        }
+    );
 }
 
 sub assert_httpd {
@@ -159,10 +165,25 @@ sub assert_httpd {
     return Future->wait_any($repeat, $timeout);
 }
 
+
 sub assert_selenium {
     my ($host, $port) = @_;
     $host //= 'localhost';
     $port //= 4444;
+
+    return assert_connect($host, $port, "assert_selenium");
+}
+
+sub assert_cereal {
+    return assert_connect(
+        'localhost',
+        $ENV{LOGGING_PORT} // 5880,
+        "assert_cereal"
+    );
+}
+
+sub assert_connect {
+    my ($host, $port, $name) = @_;
     my $loop = IO::Async::Loop->new;
     my $repeat = repeat {
         $loop->delay_future(after => 1)->then(
@@ -172,7 +193,7 @@ sub assert_selenium {
             },
         );
     } until => sub { shift->get };
-    my $timeout = $loop->timeout_future(after => 60)->else_fail("assert_selenium timeout");
+    my $timeout = $loop->timeout_future(after => 60)->else_fail("$name timeout");
     return Future->wait_any($repeat, $timeout);
 }
 
@@ -200,7 +221,7 @@ sub assert_database {
     } until => sub { defined shift->get };
 
     my $timeout = $loop->timeout_future( after => 20 )->else_fail("assert_database timeout");
-    my $any_f = Future->needs_any( $repeat, $timeout );
+    my $any_f = Future->wait_any( $repeat, $timeout );
     return $any_f->transform(
         done => sub { return },
         fail => sub { "unable to connect to $dsn as $lc->{db_user}" },
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index cbec34bdc..d205a6750 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -423,7 +423,7 @@ sub FILESYSTEM {
         "skins/yui3.css"          => { perms     => CGI_READ,
                                        overwrite => 1,
                                        contents  => $yui3_all_css },
-        "httpd/env.conf"          => { perms     => CGI_READ,
+        "$confdir/env.conf"       => { perms     => CGI_READ,
                                        overwrite => 1,
                                        contents  => \&HTTPD_ENV_CONF },
     );
@@ -460,8 +460,6 @@ sub FILESYSTEM {
                                           contents => HT_DEFAULT_DENY },
         '.circleci/.htaccess'        => { perms    => WS_SERVE,
                                           contents => HT_DEFAULT_DENY },
-        'httpd/.htaccess'            => { perms    => WS_SERVE,
-                                          contents => HT_DEFAULT_DENY },
         "$confdir/.htaccess"         => { perms    => WS_SERVE,
                                           contents => HT_DEFAULT_DENY },
         "$datadir/.htaccess"         => { perms    => WS_SERVE,