From nobody Wed May 10 10:00:52 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGVsJ6NPdz49fhC; Wed, 10 May 2023 10:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGVsJ5tdMz4XKn; Wed, 10 May 2023 10:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683712852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BGwvp3q81DBhHHQLnpRUm/Yo0jGuY3QAJLdWxJ/0fsE=; b=b2T0N54JnkkTfuRnHqvA08VDY/TwT+Nt7/WQQp6PHIWiaWlF51w+2gYQI1JFlJ8ocVIncx Ywy776leoYk7CzSJUtQFDrlAYwp1VlmPyCY26g5zceI2oMUml9lWx31N8lEsGVggASUC/y k9VDMw88MER34ZBNt5eyPaAFk1Yip2nS/hm1sUq9W3zNtegPmGaKCIGbrKpXob6Prl/pVV gvxbbdd/0PuncEdlshskQd0SFLAJ8h4ucZ8JVSHCH0jHIa4cOVnkqCqfANrB3GYj+vTDqp Ijniykt2ZHMUJ+HSESrgGME8HCXwP3gqjFSYvqV05h6//zqD+BXvqFX/pYKoLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683712852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BGwvp3q81DBhHHQLnpRUm/Yo0jGuY3QAJLdWxJ/0fsE=; b=wzk7kHVwWVEO6ulO5V0Q/cO2mwIVM3yaUMMnavgbqwc4lpvGVXxwd274f7/5moY8OnzNDA XZHLaN7ArVSb8JXbrJEeg+KkNIoOnPpW7dR9WsxU9vTiCbtt24cPwjWNAPr2l8e/uw3PrB 28CZT+a8+BeknC349Akfmgd/TOBxe9bWdg3PxOm4u2DA3Fv9ePIBcWkyO0ZNwiwBRJGjjB xr1fO1cbCpb8OQ8CK6GTioqt+xUtAEnCQvpqkT2mF4ftKnueSLwrvPQVk71tA/s1m+LD2S RerL9KTTSBL7HNyk+5jq3kdMcspSZz5JC1yYKaDL8uh/+4xYkBwLaFdyXTgR7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683712852; a=rsa-sha256; cv=none; b=Ss3IjsahR9CyQqKNqzSyAmNHJoWfP1hE+N4gMKSintRItupMGcfUFthi1Kgny+NTHu4z5f v2Yvee09t0QhgRHgBtlL0z0W39EuhZq5G5oJKN3bpx6Gr6bhYcwwS3hivVnHixh/PQ+0mQ t9BkH8cmSzKAtCQVxF1Rz710fVww2JFO76OlItklmmoa7dh3wktuu4cFsuQZZCG2Dewlnj AYY7515k9F/M/DphG1e2ykqOLa2yEzAeLX5PNeVjzcagKv6s8XJJKi0w+aW59SH/nbhJ5V zGbxXQ33KUdGDpbDtYUCpEQBeEBaHtpU5g3+EDBFH3ql4eKAcHGHkpvgIZ0a4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGVsJ4y1Zz14yj; Wed, 10 May 2023 10:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34AA0qrg051712; Wed, 10 May 2023 10:00:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34AA0quE051711; Wed, 10 May 2023 10:00:52 GMT (envelope-from git) Date: Wed, 10 May 2023 10:00:52 GMT Message-Id: <202305101000.34AA0quE051711@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 9d49b37d57f7 - main - net-mgmt/nagios-check_relayd_status: minor style fixes in the script List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d49b37d57f74ca5d1c87a4a75f44c25c0a2a207 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d49b37d57f74ca5d1c87a4a75f44c25c0a2a207 commit 9d49b37d57f74ca5d1c87a4a75f44c25c0a2a207 Author: Alexey Dokuchaev AuthorDate: 2023-05-10 09:59:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-10 09:59:32 +0000 net-mgmt/nagios-check_relayd_status: minor style fixes in the script Git rid of UTF-8 apostrophe and contraction altogether (it is spelled as "cannot" elsewhere throughout the code) and whack EOL whitespace. --- .../nagios-check_relayd_status/files/check_relayd_status | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net-mgmt/nagios-check_relayd_status/files/check_relayd_status b/net-mgmt/nagios-check_relayd_status/files/check_relayd_status index 2697222dfa5b..62246be1448c 100644 --- a/net-mgmt/nagios-check_relayd_status/files/check_relayd_status +++ b/net-mgmt/nagios-check_relayd_status/files/check_relayd_status @@ -64,7 +64,7 @@ if not all hosts in a table are up and a critical if a table and/or redirect is totally down. Options: - --help + --help Print detailed this screen --redirect STRING String with name of redirect to check. Multiple redirects @@ -74,13 +74,13 @@ Options: can be seperated by comma Examples: - $0 + $0 Checks if all redirects, tables and hosts which are defined at the relayd startup are active. $0 --redirect smtp --table pmtahost,pmtahostfallback - + Checks if the specified redirects and tables exists. Besides there will be an alert if any other redirect or table defined in the checked relayd is not active. @@ -126,10 +126,10 @@ my @execute = ($command, $parameter); # make unbuffered output $|=1; -open STDERR, ">&STDOUT" or die "Can’t dup STDOUT: $!"; +open STDERR, ">&STDOUT" or die "Cannot dup STDOUT: $!"; eval { - my @return = split(/\n/, `@execute`) + my @return = split(/\n/, `@execute`) or die "command returns an errorcode $?: '@execute'"; foreach ( @return ) { @@ -149,7 +149,7 @@ eval { if ( $cnt_hosts{'up'} == 0 ) { print "CRITICAL: relayd does not find any hosts up\n"; exit(2); - } + } for my $red ( keys %cnt_redirects ) { if ( $cnt_redirects{$red} == 0 ) {