Commit 0b48d9e7 authored by Mathieu Arnold's avatar Mathieu Arnold
Browse files

MFH: r449332

Fix not starting after crash.

When nrpe quits ungracefully, for example, if the box was rebooted, it
often does not start because the pid file is still there, and the pid in
it exists and the pid in it is in use by some other process.

The dubious code is in src/nrpe.c in write_pid_file() around line 1756
that could be axed.

But I think the easiest way to fix this is with the attached patch.
precmd is run just before starting the daemon and after checking that it
is not already running.

With this, it starts just fine, and still refuses to start if it is
really already running, but starts fine if the pid file contains a pid
that exists but is not nrpe.

PR:		221740
Submitted by:	mat
Approved by:	maintainer timeout, ports-secteam blanket
Sponsored by:	Absolight
parent 698499d2
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
PORTNAME= nrpe PORTNAME= nrpe
DISTVERSION= 2.15 DISTVERSION= 2.15
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= net-mgmt CATEGORIES= net-mgmt
MASTER_SITES= SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION} MASTER_SITES= SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION}
......
...@@ -48,6 +48,7 @@ nrpe2_prestart() ...@@ -48,6 +48,7 @@ nrpe2_prestart()
{ {
find_pidfile find_pidfile
install -d -o ${nrpe_user:-nagios} ${pidfile%/*} install -d -o ${nrpe_user:-nagios} ${pidfile%/*}
rm -f ${pidfile}
} }
run_rc_command "$1" run_rc_command "$1"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment