[WIP] Patch NGINX to allow it to better handle SIGTERM #56
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
nice! :) |
|
I ran this locally but I was getting trouble having it log out on SIGTERM at all - with the Docker Hub vanilla NGINX container it logs out quite a bit of info in debug mode (with the error.log |
|
Also, @chap it looks like the build will pass if we update the changelog, at least based on the comment on that part of the Github check. |
sbdchd
reviewed
Oct 7, 2020
| @@ -41,6 +41,26 @@ echo "Downloading $zlib_url" | |||
| echo "Downloading $uuid4_url" | |||
| (cd nginx-${NGINX_VERSION} && curl -L $uuid4_url | tar xvz ) | |||
|
|
|||
| if [ -d "/buildpack/support/patchfiles/${NGINX_VERSION}" ] | |||
There was a problem hiding this comment.
Suggested change
| if [ -d "/buildpack/support/patchfiles/${NGINX_VERSION}" ] | |
| if [ -d "/buildpack/scripts/patchfiles/${NGINX_VERSION}" ] |
sbdchd
added a commit
to AdmitHub/heroku-buildpack-nginx
that referenced
this pull request
Oct 7, 2020
After compiling nginx with the modifications:
```shell
make build-heroku-18
```
I tested that the changes actually worked:
```shell
apt-get update
apt-get install -y python3-venv
python3 -m venv venv
./venv/bin/pip install gunicorn
FORCE=1 bin/start-nginx
./venv/bin/gunicorn -b unix:/tmp/nginx.socket app:app
# in another terminal (should hang for 15s assuming app is setup correctly)
curl localhost:5000
# in another terminal
# get the PID
ps aux | grep master
# should be graceful, that is nginx should shutdown after it finishes serving the request
kill -TERM $PID
FORCE=1 bin/start-nginx
# should kill nginx without waiting
# curl returns an error:
# curl: (52) Empty reply from server
kill -QUIT $PID
```
The `app` used by `gunicorn` was the hello world with a sleep thrown in
so we mimic a long running request.
```python
import time
def app(environ, start_response):
time.sleep(15)
data = b"Hello, World!\n"
start_response("200 OK", [
("Content-Type", "text/plain"),
("Content-Length", str(len(data)))
])
return iter([data])
```
Based on heroku#56
This was referenced Oct 7, 2020
sbdchd
added a commit
to AdmitHub/heroku-buildpack-nginx
that referenced
this pull request
Oct 8, 2020
After compiling nginx with the modifications:
```shell
make build-heroku-18
```
I then tested that the changes actually worked:
```shell
apt-get update
apt-get install -y python3-venv
python3 -m venv venv
./venv/bin/pip install gunicorn
FORCE=1 bin/start-nginx
./venv/bin/gunicorn -b unix:/tmp/nginx.socket app:app
# in another terminal (should hang for 15s assuming app is setup correctly)
curl localhost:5000
# in another terminal
# get the PID
ps aux | grep master
# should be graceful, that is nginx should shutdown after it finishes serving the request
kill -TERM $PID
FORCE=1 bin/start-nginx
# should kill nginx without waiting
# curl returns an error:
# curl: (52) Empty reply from server
kill -QUIT $PID
```
The `app` used by `gunicorn` was the hello world with a sleep thrown in
so we mimic a long running request.
```python
import time
def app(environ, start_response):
time.sleep(15)
data = b"Hello, World!\n"
start_response("200 OK", [
("Content-Type", "text/plain"),
("Content-Length", str(len(data)))
])
return iter([data])
```
Based on heroku#56
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Not sure yet if this is going to work, but trying to address the problems raised in #31