diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-06-20 23:10:32 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-06-28 22:41:58 +0200 |
| commit | 5ac448e57e94bb8f286df0cfcebb7dfed066ed40 (patch) | |
| tree | 8334bb1984f62f7463c1bb5f7750725abfe95266 /Bugzilla | |
| parent | e1b48df3b5cdd81920782a8585864af3b294e919 (diff) | |
| download | bugzilla-5ac448e57e94bb8f286df0cfcebb7dfed066ed40.tar.gz bugzilla-5ac448e57e94bb8f286df0cfcebb7dfed066ed40.tar.xz | |
add hypnotoad to vagrant
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/DaemonControl.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Quantum.pm | 3 | ||||
| -rw-r--r-- | Bugzilla/Quantum/Plugin/Glue.pm | 9 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Bugzilla/DaemonControl.pm b/Bugzilla/DaemonControl.pm index 19bc440f7..9cea1a898 100644 --- a/Bugzilla/DaemonControl.pm +++ b/Bugzilla/DaemonControl.pm @@ -105,7 +105,7 @@ sub run_httpd { # or else apache will kill its parent. setsid(); $ENV{BUGZILLA_HTTPD_ARGS} = encode_json(\@args); - my @command = ( $^X, '/app/bugzilla.pl', 'daemon', "--listen=http://*:$ENV{PORT}" ); + my @command = ( $^X, '/app/local/bin/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 7209a204b..d9bb7a75a 100644 --- a/Bugzilla/Quantum.pm +++ b/Bugzilla/Quantum.pm @@ -33,9 +33,6 @@ sub startup { my ($self) = @_; $self->plugin('Bugzilla::Quantum::Plugin::Glue'); - my $port = $ENV{PORT} // 3000; - untaint($port); - $self->config(hypnotoad => {listen => ["http://*:$port"]}); my $r = $self->routes; Bugzilla::Quantum::CGI->load_all($r); diff --git a/Bugzilla/Quantum/Plugin/Glue.pm b/Bugzilla/Quantum/Plugin/Glue.pm index b46ffb1e1..19896817c 100644 --- a/Bugzilla/Quantum/Plugin/Glue.pm +++ b/Bugzilla/Quantum/Plugin/Glue.pm @@ -29,6 +29,13 @@ sub register { } } + # hypnotoad is weird and doesn't look for MOJO_LISTEN itself. + $app->config( + hypnotoad => { + listen => [ $ENV{MOJO_LISTEN} ], + }, + ); + $app->hook( around_dispatch => sub { my ($next, $c) = @_; @@ -86,4 +93,4 @@ sub register { -1;
\ No newline at end of file +1; |