This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
The following commit(s) were added to refs/heads/master by this push:
new dd25a6f Fix DAEMON-459 - DaemonController.reload() now works more
than once.
dd25a6f is described below
commit dd25a6f94fac8832d31917d19a66f79b7cbcbb27
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 4 20:10:10 2023 +0100
Fix DAEMON-459 - DaemonController.reload() now works more than once.
---
src/changes/changes.xml | 4 ++++
src/native/unix/native/jsvc-unix.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0abc721..ca50eda 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -55,6 +55,10 @@
Procrun. Allow Windows service dependencies to be managed by Procrun or
by 'sc config ...'.
</action>
+ <action issue="DAEMON-459" type="fix" dev="markt" due-to="Klaus Malorny">
+ jsvc. Fix DaemonController.reload() only working the first time it is
+ called.
+ </action>
<!-- UPDATES -->
<action type="update" dev="ggregory" due-to="Dependabot">
Bump commons-parent from 54 to 57 #71, #91.
diff --git a/src/native/unix/native/jsvc-unix.c
b/src/native/unix/native/jsvc-unix.c
index a98757a..cfb68f0 100644
--- a/src/native/unix/native/jsvc-unix.c
+++ b/src/native/unix/native/jsvc-unix.c
@@ -910,7 +910,7 @@ static int child(arg_data *args, home_data *data, uid_t
uid, gid_t gid)
sigaction(SIGUSR2, &act, NULL);
sigaction(SIGTERM, &act, NULL);
sigaction(SIGINT, &act, NULL);
-
+ controlled = getpid ();
log_debug("Waiting for a signal to be delivered");
create_tmp_file(args);
while (!stopping) {
