Date: Wed, 6 Sep 2017 09:26:51 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449333 - in branches/2017Q3/net-mgmt/nrpe: . files Message-ID: <201709060926.v869QpQ5064844@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Sep 6 09:26:51 2017 New Revision: 449333 URL: https://svnweb.freebsd.org/changeset/ports/449333 Log: 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 Modified: branches/2017Q3/net-mgmt/nrpe/Makefile branches/2017Q3/net-mgmt/nrpe/files/nrpe2.in Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/net-mgmt/nrpe/Makefile ============================================================================== --- branches/2017Q3/net-mgmt/nrpe/Makefile Wed Sep 6 09:24:10 2017 (r449332) +++ branches/2017Q3/net-mgmt/nrpe/Makefile Wed Sep 6 09:26:51 2017 (r449333) @@ -3,7 +3,7 @@ PORTNAME= nrpe DISTVERSION= 2.15 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-mgmt MASTER_SITES= SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION} Modified: branches/2017Q3/net-mgmt/nrpe/files/nrpe2.in ============================================================================== --- branches/2017Q3/net-mgmt/nrpe/files/nrpe2.in Wed Sep 6 09:24:10 2017 (r449332) +++ branches/2017Q3/net-mgmt/nrpe/files/nrpe2.in Wed Sep 6 09:26:51 2017 (r449333) @@ -48,6 +48,7 @@ nrpe2_prestart() { find_pidfile install -d -o ${nrpe_user:-nagios} ${pidfile%/*} + rm -f ${pidfile} } run_rc_command "$1"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709060926.v869QpQ5064844>