diff options
| -rw-r--r-- | Bugzilla/DaemonControl.pm | 8 | ||||
| -rw-r--r-- | Bugzilla/Quantum.pm | 1 | ||||
| -rw-r--r-- | Bugzilla/Quantum/Plugin/Glue.pm | 7 | ||||
| -rw-r--r-- | Dockerfile | 8 | ||||
| -rw-r--r-- | README.rst | 35 |
5 files changed, 11 insertions, 48 deletions
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) = @_; diff --git a/Dockerfile b/Dockerfile index 847fb0a69..412b7c92e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,12 +9,8 @@ ENV CIRCLE_BUILD_URL=${CIRCLE_BUILD_URL} ENV CIRCLE_SHA1=${CIRCLE_SHA1} ENV LOG4PERL_CONFIG_FILE=log4perl-json.conf -ENV HTTPD_StartServers=8 -ENV HTTPD_MinSpareServers=5 -ENV HTTPD_MaxSpareServers=20 -ENV HTTPD_ServerLimit=256 -ENV HTTPD_MaxClients=256 -ENV HTTPD_MaxRequestsPerChild=4000 +ENV PATH=/app/local/bin:/opt/rh/sclo-git25/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV PERL5LIB=/app:/app/local/lib/perl5:/app/lib ENV PORT=8000 diff --git a/README.rst b/README.rst index 985be314e..0d8d03f38 100644 --- a/README.rst +++ b/README.rst @@ -330,41 +330,6 @@ BMO_use_mailer_queue Usually configured on the MTA section of the admin interface, you may change this here for testing purposes. Should be 1 or 0. If 1, the job queue will be used. For testing, only set to 0 if the BMO_mail_delivery_method is None or Test. -HTTPD_StartServers - Sets the number of child server processes created on startup. - As the number of processes is dynamically controlled depending on the load, - there is usually little reason to adjust this parameter. - Default: 8 - -HTTPD_MinSpareServers - Sets the desired minimum number of idle child server processes. An idle - process is one which is not handling a request. If there are fewer than - MinSpareServers idle, then the parent process creates new children at a - maximum rate of 1 per second. - Default: 5 - -HTTPD_MaxSpareServers - Sets the desired maximum number of idle child server processes. An idle - process is one which is not handling a request. If there are more than - MaxSpareServers idle, then the parent process will kill off the excess - processes. - Default: 20 - -HTTPD_MaxClients - Sets the maximum number of child processes that will be launched to serve requests. - Default: 256 - -HTTPD_ServerLimit - Sets the maximum configured value for MaxClients for the lifetime of the - Apache process. - Default: 256 - -HTTPD_MaxRequestsPerChild - Sets the limit on the number of requests that an individual child server - process will handle. After MaxRequestsPerChild requests, the child process - will die. If MaxRequestsPerChild is 0, then the process will never expire. - Default: 4000 - USE_NYTPROF Write `Devel::NYTProf`_ profiles out for each requests. These will be named /app/data/nytprof.$host.$script.$n.$pid, where $host is |