From 45cfb6f137308b24d9147beb455a53c034c04ddd Mon Sep 17 00:00:00 2001 From: Martin Traverse Date: Mon, 18 Nov 2024 18:14:14 +0000 Subject: [PATCH 1/2] Improve stale PID handling in service-ctrl for Linux / macOS --- dist/scripts/service-ctrl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/scripts/service-ctrl.sh b/dist/scripts/service-ctrl.sh index eb6431210..040dfd4dd 100644 --- a/dist/scripts/service-ctrl.sh +++ b/dist/scripts/service-ctrl.sh @@ -198,7 +198,7 @@ run() { PID=`cat "\${PID_FILE}"` # Handle stale PID files - only block startup if the service is really running - if `ps -p \$PID > /dev/null`; then + if `ps -p \$PID | grep \$APPLICATION_CLASS > /dev/null`; then echo "Application is already running, try \$0 [stop|kill]" exit 255 else @@ -235,7 +235,7 @@ start() { PID=`cat "\${PID_FILE}"` # Handle stale PID files - only block startup if the service is really running - if `ps -p \$PID > /dev/null`; then + if `ps -p \$PID | grep \$APPLICATION_CLASS > /dev/null`; then echo "Application is already running, try \$0 [stop|kill]" exit 255 else From b1b8748ddafc0547d18dbfc6860bf5386b5a2f24 Mon Sep 17 00:00:00 2001 From: Martin Traverse Date: Mon, 18 Nov 2024 19:38:46 +0000 Subject: [PATCH 2/2] Bump Netty version for compliance --- gradle/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 1cf2c601d..41b0dce0a 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -26,7 +26,7 @@ ext { license_check_plugin_version = "2.8" // Core platform technologies - netty_version = '4.1.113.Final' + netty_version = '4.1.115.Final' guava_version = '33.3.0-jre' proto_version = '4.28.2' grpc_version = '1.68.0'