Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Patch NGINX to allow it to better handle SIGTERM #56

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft

[WIP] Patch NGINX to allow it to better handle SIGTERM #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3fdc1a8
patch nginx sigterm when $NGINX_SIGTERM_PATCH set
chap May 22, 2020
77a38ec
Create 0001-Custom-Terminate-Signal.patch
chap May 22, 2020
7528cc1
Update 0001-Custom-Terminate-Signal.patch
chap May 22, 2020
f8f70e0
Update build_nginx
chap May 22, 2020
7a270bd
Update build_nginx
chap May 22, 2020
9ef51d8
Create 0001-Custom-Terminate-Signal.patch
chap May 22, 2020
3124c1e
Delete 0001-Custom-Terminate-Signal.patch
chap May 22, 2020
04913d3
Create 0001-Custom-Terminate-Signal.patch
chap May 22, 2020
12d24c8
Create .gitkeep
chap May 22, 2020
fc9f5b1
Delete 0001-Custom-Terminate-Signal.patch
chap May 22, 2020
90fb7fe
Update build_nginx
chap May 22, 2020
6f3f591
rebuild bin / heroku-18
chap May 22, 2020
b821eaa
set vars
chap May 23, 2020
f26d8e9
Update 0001-Custom-Terminate-Signal.patch
chap May 23, 2020
1d9504f
rebuild bin
chap May 23, 2020
7afeaf8
rebuild
chap May 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bin/nginx-debug-heroku-18
View file
Open in desktop
Binary file not shown.
Binary file modified bin/nginx-heroku-18
View file
Open in desktop
Binary file not shown.
20 changes: 20 additions & 0 deletions scripts/build_nginx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" ]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if [ -d "/buildpack/support/patchfiles/${NGINX_VERSION}" ]
if [ -d "/buildpack/scripts/patchfiles/${NGINX_VERSION}" ]

then
PATCHFILES=$(find /buildpack/scripts/patchfiles/${NGINX_VERSION} -name '*.patch')
else
PATCHFILES=$(find /buildpack/scripts/patchfiles/default -name '*.patch')
fi


NGX_SHUTDOWN_SIGNAL=TERM
NGX_TERMINATE_SIGNAL=QUIT

(
cd nginx-${NGINX_VERSION}
for f in $PATCHFILES
do
echo "patch: $f"
patch -p0 < $f
done
)

(
cd nginx-${NGINX_VERSION}
./configure \
Expand Down
13 changes: 13 additions & 0 deletions scripts/patchfiles/1.18.0/0001-Custom-Terminate-Signal.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- src/core/ngx_config.h 2020-05-23 04:21:07.000000000 +0000
+++ src/core/ngx_config.h 2020-05-23 04:15:17.000000000 +0000
@@ -56,9 +56,8 @@

#define ngx_random random

-/* TODO: #ifndef */
-#define NGX_SHUTDOWN_SIGNAL QUIT
-#define NGX_TERMINATE_SIGNAL TERM
+#define NGX_SHUTDOWN_SIGNAL TERM
+#define NGX_TERMINATE_SIGNAL QUIT
#define NGX_NOACCEPT_SIGNAL WINCH
#define NGX_RECONFIGURE_SIGNAL HUP
1 change: 1 addition & 0 deletions scripts/patchfiles/default/.gitkeep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@