Skip to content

Commit 19368b1

Browse files
authored
Patch sigterm for version 1.17.0 too (#169)
* Adds the missing patchfile for 1.17.0, meaning sigterm is now correctly patched for that version too. * Removes the "default" patchfiles directory and makes the per-version directories mandatory, so future releases can't accidentally forget to add a new patchfile. * Removes the patchfile for pgbouncer 1.7 and 1.13.0 since those versions are no longer built. Closes #150. Closes #168. GUS-W-11700066.
1 parent b90524d commit 19368b1

File tree

6 files changed

+11
-20
lines changed

6 files changed

+11
-20
lines changed

Changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## Unreleased
22

3+
## v0.12.0 (September 6, 2022)
4+
* Add missing `SIGTERM` patch for v1.17.0 (corrects shutdown behaviour on Heroku-22)
5+
36
## v0.11.0 (June 20, 2022)
47
* Update to pgbouncer v1.17.0 on Heroku-22, to fix OpenSSL 3 related crashes
58

pgbouncer-heroku-22.tgz

-17 Bytes
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
--- src/main.c 2019-09-26 21:37:14.000000000 +0000
2-
+++ src/main.c 2020-03-20 20:43:20.876976754 +0000
3-
@@ -425,9 +425,7 @@
4-
1+
--- src/main.c
2+
+++ src/main.c
3+
@@ -445,9 +445,7 @@
4+
55
static void handle_sigterm(evutil_socket_t sock, short flags, void *arg)
66
{
77
- log_info("got SIGTERM, fast exit");
88
- /* pidfile cleanup happens via atexit() */
99
- exit(1);
1010
+ log_info("Got SIGTERM, ignoring!");
1111
}
12-
12+
1313
static void handle_sigint(evutil_socket_t sock, short flags, void *arg)

support/patchfiles/1.7/0001-Disable-SIGTERM.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

support/patchfiles/default/.gitkeep

Whitespace-only changes.

support/pgbouncer-build

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
set -e
3+
set -euo pipefail
44

55
PGBOUNCER_VERSION=${PGBOUNCER_VERSION-1.14.0}
66

@@ -18,7 +18,8 @@ if [ -d "/buildpack/support/patchfiles/${PGBOUNCER_VERSION}" ]
1818
then
1919
PATCHFILES=$(find /buildpack/support/patchfiles/"${PGBOUNCER_VERSION}" -name '*.patch')
2020
else
21-
PATCHFILES=$(find /buildpack/support/patchfiles/default -name '*.patch')
21+
echo "Missing patchfiles directory for ${PGBOUNCER_VERSION}!" >&2
22+
exit 1
2223
fi
2324

2425
(

0 commit comments

Comments
 (0)