Date: Mon, 8 Jan 2018 13:38:55 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458415 - in head/net-mgmt/nagios-plugins: . files Message-ID: <201801081338.w08Dctck089983@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Jan 8 13:38:55 2018 New Revision: 458415 URL: https://svnweb.freebsd.org/changeset/ports/458415 Log: Fix check_ntp_time. It periodically returns "Socket timeout" when one of several ntp server doesn't response. PR: 224926 Submitted by: admins perceptyx com Sponsored by: Absolight Added: head/net-mgmt/nagios-plugins/files/patch-plugins-check_ntp_time.c (contents, props changed) Modified: head/net-mgmt/nagios-plugins/Makefile (contents, props changed) Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Mon Jan 8 13:38:51 2018 (r458414) +++ head/net-mgmt/nagios-plugins/Makefile Mon Jan 8 13:38:55 2018 (r458415) @@ -3,7 +3,7 @@ PORTNAME= nagios-plugins PORTVERSION= 2.2.1 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://www.nagios-plugins.org/download/ \ Added: head/net-mgmt/nagios-plugins/files/patch-plugins-check_ntp_time.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/nagios-plugins/files/patch-plugins-check_ntp_time.c Mon Jan 8 13:38:55 2018 (r458415) @@ -0,0 +1,15 @@ +Obtained from: +https://github.com/nagios-plugins/nagios-plugins/commit/df485c74f582708d6ce37cdf99880fe75215498a + +--- plugins/check_ntp_time.c.orig 2018-01-04 12:59:01.422087000 -0800 ++++ plugins/check_ntp_time.c 2018-01-04 13:05:56.317152000 -0800 +@@ -415,6 +415,9 @@ + } + } + /* lather, rinse, repeat. */ ++ /* break if we have one response but other ntp servers doesn't response */ ++ /* greater than timeout_interval/2 */ ++ if (servers_completed && now_time-start_ts > timeout_interval/2) break; + } + + if (one_read == 0) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801081338.w08Dctck089983>