From nobody Sun Aug 07 05:31:47 2022 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 4M0nyC2WT8z4XmHV; Sun, 7 Aug 2022 05:31:47 +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 4M0nyC20Qpz3lkS; Sun, 7 Aug 2022 05:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659850307; 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=CMb9yvxNPRCnK8jsShzxoy89+3DEAwo0uu7ugBHXbOk=; b=S0Jrwgrdsb5AhLzkmLTHAswT0r+b+LarRF2dwZn0p3gOJh4aaaGm7DgO1f4svoB9y+XGUy lSeJc5w+rcnjTk6XxHbbu+GBu9f1YIzy4yY+HTj+0eOLt1BkvUVMTV/YyOTQPnPwPos8w/ KYZ+r5HJ3S84K7Jrd9aDOeUyMWnJuHTWrSNo36ZVxrLVhNih0eJaIkIqkn23bqDOKOVTDS rb7Hm0oOoeKeqNUqn0XLavLP57MQZ3sOhFP8it0mbOeReZIpHwtSU0AU0yUHQIzXXtMmi5 BxdMVqUBgIyshooCfxpTBy9gtBm0rcUQQeoRLhklA0umkS3poKWmDDY7b4OPsA== 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 4M0nyC13Zwz11qy; Sun, 7 Aug 2022 05:31:47 +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 2775Vlgf037592; Sun, 7 Aug 2022 05:31:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2775VljV037591; Sun, 7 Aug 2022 05:31:47 GMT (envelope-from git) Date: Sun, 7 Aug 2022 05:31:47 GMT Message-Id: <202208070531.2775VljV037591@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 206e447a8330 - main - sysutils/bsdstats: Set timeout to wait response from server 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 206e447a8330a3dba38f4e4a1210f4f04eb7e783 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659850307; 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=CMb9yvxNPRCnK8jsShzxoy89+3DEAwo0uu7ugBHXbOk=; b=SgcTt0PinqiakE3x7n6f6Jee2IPYOqbJpWycUxS6PWChCCVnfbzpB5e16xqRuftumzlkCH fzALqzwRMJAUS6yZVsTI8NfcYNViRODyTI6oexIrN+qykK/RKdaGMDXvJFzYCSGGIQCXaK YGTVGRgkg3Wy9cHAps7eAyJRhhV9lCQzlF397iWem7G0ZfdCoSflcgYOI18tf46zYMkf2z VSIjgpB8YdUeF069AkEFMs3jaR0Zz8fG228YTm8b17VXVgWBlvvOrZLqsTjO1Uj74ef513 o+o5ube3/OkJ1ybkZwr2fehw9WIvOaM0m6AkLByKFcTUbNZajkMWGpVmPxRa5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659850307; a=rsa-sha256; cv=none; b=m0Rd57IGVTGOqw+//UrtxbXqiUCjjwZd/ycDBakX7CABt4vTt7XNrVqpSNaESe3E4BTRZo BjtlhASqWG4qwzuu6M1Q8L8IExy49ZmmiggMsQXX2JR4tBCYuDBKILF0Cr1kWG/QI1bGQ2 26dgFwfNpuRKJi1nU5iynQRb+HPIeVrtMTYbf7Un8/wiKlkdmyZXqSOCcAYgTcEgVvmlYF 2N+m6fdBqmJrSb0MlGPtita+f2Wbt+P1r6PBgHgInP/abVgjZMeq0MthpldU8fhjsjouac RgzMLPs+XUUisotXpNxNNzYlPyAVG3e16JtADO1A/nwT1UW1fqVzCdx6MTfgvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=206e447a8330a3dba38f4e4a1210f4f04eb7e783 commit 206e447a8330a3dba38f4e4a1210f4f04eb7e783 Author: Yasuhiro Kimura AuthorDate: 2022-07-22 19:02:22 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-08-07 05:30:25 +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 --- 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 6935afad167e..3a64e8fd4a1a 100644 --- a/sysutils/bsdstats/Makefile +++ b/sysutils/bsdstats/Makefile @@ -1,6 +1,6 @@ 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?"