Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/changes/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
<!-- FIX -->
<action type="fix" dev="markt" due-to="Alex Dupre and Michael Osipov">jsvc. Fix a regression in 1.5.1 that exposed long standing bugs around the locking and unlocking of pid files. Also fix the locking/unlocking bugs.</action>
<!-- ADD -->
<action dev="michaelo" type="add">
jsvc. Use FreeBSD's setproctitle(3) to pass -procname similar to daemon(8).
</action>
<!-- UPDATE -->
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump org.apache.commons:commons-parent from 93 to 96.</action>
</release>
Expand Down
5 changes: 5 additions & 0 deletions src/native/unix/native/jsvc-unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -1374,6 +1374,11 @@ static int run_controller(arg_data *args, home_data *data, uid_t uid, gid_t gid)
to the child, and wait for it to die */
controlled = pid;

#ifdef OS_FREEBSD
/* Rename controller process to include JVM child PID */
setproctitle("%s[%d]", args->procname, pid);
#endif

#ifdef OS_CYGWIN
SetTerm(cygwincontroller);
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/site/xdoc/jsvc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ Where options include:
-javaagent:&lt;jarpath&gt;[=&lt;options&gt;]
load Java programming language agent, see java.lang.instrument
-procname &lt;procname&gt;
use the specified process name (works only for Linux)
use the specified process name (works only for Linux and FreeBSD)
-wait &lt;waittime&gt;
wait waittime seconds for the service to start
waittime should multiple of 10 (min=10)
Expand Down
Loading