From 64830ef3c076b72d9da3eb590f22bc4d722c8d4c Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Thu, 21 Jun 2018 11:05:53 -0400
Subject: more fixes

---
 Bugzilla/DaemonControl.pm       | 8 ++------
 Bugzilla/Quantum.pm             | 1 -
 Bugzilla/Quantum/Plugin/Glue.pm | 7 +++++++
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/DaemonControl.pm b/Bugzilla/DaemonControl.pm
index 9cea1a898..d99c13259 100644
--- a/Bugzilla/DaemonControl.pm
+++ b/Bugzilla/DaemonControl.pm
@@ -24,7 +24,7 @@ use IO::Async::Signal;
 use IO::Socket;
 use LWP::Simple qw(get);
 use JSON::MaybeXS qw(encode_json);
-use POSIX qw(setsid WEXITSTATUS);
+use POSIX qw(WEXITSTATUS);
 
 use base qw(Exporter);
 
@@ -100,12 +100,8 @@ sub run_httpd {
     my $exit_f = $loop->new_future;
     my $httpd  = IO::Async::Process->new(
         code => sub {
-
-            # we have to setsid() to make a new process group
-            # or else apache will kill its parent.
-            setsid();
             $ENV{BUGZILLA_HTTPD_ARGS} = encode_json(\@args);
-            my @command = ( $^X, '/app/local/bin/hypnotoad', '/app/bugzilla.pl', '-f' ); 
+            my @command = ( 'hypnotoad', '/app/bugzilla.pl', '-f' );
             exec @command
               or die "failed to exec $command[0] $!";
         },
diff --git a/Bugzilla/Quantum.pm b/Bugzilla/Quantum.pm
index d9bb7a75a..0ee4c8798 100644
--- a/Bugzilla/Quantum.pm
+++ b/Bugzilla/Quantum.pm
@@ -22,7 +22,6 @@ use Bugzilla::Extension ();
 use Bugzilla::Install::Requirements ();
 use Bugzilla::Util ();
 use Bugzilla::RNG ();
-use JSON::MaybeXS qw(decode_json);
 use Cwd qw(realpath);
 
 use MojoX::Log::Log4perl::Tiny;
diff --git a/Bugzilla/Quantum/Plugin/Glue.pm b/Bugzilla/Quantum/Plugin/Glue.pm
index 19896817c..07ac10c49 100644
--- a/Bugzilla/Quantum/Plugin/Glue.pm
+++ b/Bugzilla/Quantum/Plugin/Glue.pm
@@ -12,6 +12,7 @@ use Try::Tiny;
 use Bugzilla::Constants;
 use Bugzilla::Quantum::Template;
 use Bugzilla::Logging;
+use JSON::MaybeXS qw(decode_json);
 
 sub register {
     my ( $self, $app, $conf ) = @_;
@@ -36,6 +37,12 @@ sub register {
         },
     );
 
+    Mojo::IOLoop->next_tick(
+        sub {
+
+        }
+    );
+
     $app->hook(
         around_dispatch => sub {
             my ($next, $c) = @_;
-- 
cgit v1.2.3-24-g4f1b