From nobody Sun Aug 7 05:36:50 2022 X-Original-To: dev-commits-ports-branches@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 4M0p426RPrz4XnKS; Sun, 7 Aug 2022 05:36:50 +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 4M0p425sVtz3msm; Sun, 7 Aug 2022 05:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659850610; 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=sEn+hUkPONruHGTgndLfiNYhCIrjMuzJDE1mC73WtbA=; b=fhwPd1hFpo6VUgciXJC3hp1OU197Jkxwy38Qaxw0CpT2lIxv1/pNFOm8ygiu1uV2O0WG8J b9+EhCUEYiMRzh3isTBgCuIO2+s3ce7ZW3XPeB0p711pxHFmclbLz19foa3PiVWHND59hF bqZtkodI3f79Um0EMrjD2afklfiiA/hWTMIx1Td3nsl/5JIxtCBwe5EUnyvIVVSe0k3D7L rTgalIcXkce9BjWW/aEo2Ig9dqEVNkv0HHvtavufs4pMIXejk9E/0QjCVVukFoRNcRQlIH uckftlSpBW5jnXXkr5ZBtf8PN2Br8sWJ2aex4lMcCn8OMyiBqN6MZclZOkL02w== 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 4M0p424twqz11d0; Sun, 7 Aug 2022 05:36:50 +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 2775ao7R042121; Sun, 7 Aug 2022 05:36:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2775aoWI042120; Sun, 7 Aug 2022 05:36:50 GMT (envelope-from git) Date: Sun, 7 Aug 2022 05:36:50 GMT Message-Id: <202208070536.2775aoWI042120@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 2ec30f23b3bb - 2022Q3 - sysutils/bsdstats: Set timeout to wait response from server List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 2ec30f23b3bb475e3dfd4022c992ab53f2076055 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659850610; 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=sEn+hUkPONruHGTgndLfiNYhCIrjMuzJDE1mC73WtbA=; b=M82xxrjQQsle8aWG9cXHq64kobQTct1JTWysCehYBWKcxe7Ssnz7CsxvIIzwH+BwWPboAz K3LHF/cC9l7teCDRyEjW8UzzdyM808g2et9Mn9jFE2NbV/duiq22NIOVqlLFKN1VQzgXZU EzpHQe9wEdiq0b5WV51/kjuZBn6WV+S++AWsYc5JiziT6uHFIrYdEA3OwNg+onR38ykb6A 8VhKKvbPUzR2mhjXXHChiFrLxFYkCgcKuArmSsDoYbFgBCm1PUP1mC7t3oWwt5dvhtL0a3 7ykEhT86iTUIrLEybzjuS/KCoNxoXGJW9dhILbYx11GY0aZmucHlK/zuJb21IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659850610; a=rsa-sha256; cv=none; b=WIZJqe5nQG60E8ul+7pNgTSrW7h5YtPvfP0L27iV48ADyOCy+4ArLwa1EjsPi38deXWvVh TmKrDA/LQnXGSELWp0g9yBmE9kKRk2tCdPbfr9bP7W0LZb4YUaO8+zTJOo16bYXuAiyE8v ZtEsk0/jjh4cn2UbEMVDizPW6+dHQmqM//e8u6U8XC/DWl76z46+zBmr44KC0YTFKXzhHI k8Bj7Pwnk519TqqNYKFnOgVmyg65DC+fyEIlYke9QLQcB2CfyRy/MM7v9rRP0f0snfTbNr 7uRqY0+mHv6fzPPONjOspvKRdyim5IqRN9PU4U7vINc3KgQGNmLe6W43mzXv8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ec30f23b3bb475e3dfd4022c992ab53f2076055 commit 2ec30f23b3bb475e3dfd4022c992ab53f2076055 Author: Yasuhiro Kimura AuthorDate: 2022-07-22 19:02:22 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-08-07 05:33:41 +0000 sysutils/bsdstats: Set timeout to wait response from server Currently 300.statistics hangs up if server accepts connection but doesn't respond to the request. So set timeout to wait response from server. PR: 265389 Approved by: maintainer timeout MFH: 2022Q3 (cherry picked from commit 206e447a8330a3dba38f4e4a1210f4f04eb7e783) --- sysutils/bsdstats/Makefile | 2 +- sysutils/bsdstats/files/300.statistics.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysutils/bsdstats/Makefile b/sysutils/bsdstats/Makefile index e696ed85b68e..cd38ddc5150f 100644 --- a/sysutils/bsdstats/Makefile +++ b/sysutils/bsdstats/Makefile @@ -2,7 +2,7 @@ PORTNAME= bsdstats PORTVERSION= 7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils DISTFILES= diff --git a/sysutils/bsdstats/files/300.statistics.in b/sysutils/bsdstats/files/300.statistics.in index 0985059d5555..e23df42fb224 100644 --- a/sysutils/bsdstats/files/300.statistics.in +++ b/sysutils/bsdstats/files/300.statistics.in @@ -151,7 +151,7 @@ do_http_request() { if [ -n "${body}" ]; then txt="${txt}${CR}${NL}Content-Length: ${#body}"; fi txt="${txt}${CR}${NL}${CR}${NL}${body}" - resp=$(echo "${txt}" | nlog "out" | ${NC} ${nc_host} ${nc_port} | nlog "in" 2>/dev/null) + resp=$(echo "${txt}" | nlog "out" | ${NC} -w ${timeout} ${nc_host} ${nc_port} | nlog "in" 2>/dev/null) if [ $? -ne 0 ]; then if [ ${do_log} -ne 0 ]; then log "FAIL" "Failed to send data to the host ${nc_host}:${nc_port}, is network or host down?"