From patchwork Mon Feb 27 14:51:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Brasovean X-Patchwork-Id: 732870 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vX4Sz1jFnz9s9j for ; Tue, 28 Feb 2017 01:53:07 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KGXagom0"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WOrIc0gW"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PHwirDF9SBvNvkozlzQ/Odu8kteFGZjSbiFj2SEU8g8=; b=KGXagom0bBMAeC 6QxAFfQk5gqgrJZZ9NjbarvK6jXMMF6nlSGLjwkNX9y6utjVgj2qJsobqPdjgLGvDqV4xvOzbEeVz 9OjysgaMcKwt8qDvRezLkYSDOFSsYerMq/MEqU0wEN8vaDNoJpZevp5vpB+IHb5ii+O3Ip42uCmfl Aaq724SQLr+K35iklg9yI6JEcM2CD0/dIBMpcuiFvZvFwACsUK3JuZiQumeUBN89LzG8VlcIq7fLC 99+rTYUd47cZXg/84dmDE+ygxpm2yowgd1tddw/6v15WHlDzJztN00aWHnNE9cGeVFjNN4hNccQok bDdSIRrv3MGB2yJfHtog==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ciMfC-0000qH-0T; Mon, 27 Feb 2017 14:52:34 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ciMek-0000Th-IS for lede-dev@lists.infradead.org; Mon, 27 Feb 2017 14:52:09 +0000 Received: by mail-wm0-x241.google.com with SMTP id u63so13788652wmu.2 for ; Mon, 27 Feb 2017 06:51:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=60ZpdJuS9IQBUnQiA/5LWonKCHTipXoxJBWxL65n+ps=; b=WOrIc0gWgTSj2KG/XNjQC1+Q8P2kT4YpVKq94Y+AJIikxNuQ1BKKroYOmaAmi1kzop xy1LW+dKdtzY1w9Tywj4mw9l6uLxhXUcQBDuvgDSxEHRRK8VU2S3KZZUDwZpm0Pqytzp 2smzeIHOKHwbkRVXzPtcN0Ycu7TG0sLRo2hu85LlJkKzLqnmkcMGMd8guxBMg0bS5c06 liDDf9bfFzAFs7GEUzKZoydRFT18ii78PzbesDQRIAlKaRwwmJWWUkrU2psKRlHQvBl8 56ZaLDDqZRfFP9bTVwbzsuwjrjAl/ObMojGmPWQWagAk/gZTxFDVrjmD0OwnDqYN+8Be ZkuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=60ZpdJuS9IQBUnQiA/5LWonKCHTipXoxJBWxL65n+ps=; b=XRGPwy32/T4UF2gcRLqx9amFXsmG+okREEk6IEmVeBIEzDbKjiOfuGN/9xuLfnC9bg vGfY8WJdWwXVg9tUqyjJv37IqXsFSg6khnqs4odhYq/tp4MJdSA+QAf0we2BOLmKuT3O yTk8MEWzAkrcc4FbHdeqkYv00zkEe4IWLr5zRm1rci1DQeu4gBZFXFTzRpDTIQSiI4Il SyY6hgr3cF5cBm5Ls9xOjByJuQH611pyrUwzs734ZOqi4ml3dzZEWa25N4u9RuGtsSf9 srtL/FOh9r9EBNzVy222si/8J16vgNGnT2TzcpJ2dKQ2OmTz6z2VOk9XGqsljPu66PXO Bh1Q== X-Gm-Message-State: AMke39kyd06hqxNC2fTQetL+HyfRZZqhhu0qxdyA5gz1mR1DFB4/MMjDjh2fQ/rZbhBhPg== X-Received: by 10.28.141.193 with SMTP id p184mr13793647wmd.122.1488207103958; Mon, 27 Feb 2017 06:51:43 -0800 (PST) Received: from localhost.localdomain ([5.2.198.78]) by smtp.gmail.com with ESMTPSA id k70sm14572646wmc.3.2017.02.27.06.51.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Feb 2017 06:51:43 -0800 (PST) From: Claudiu Brasovean To: lede-dev@lists.infradead.org Date: Mon, 27 Feb 2017 16:51:02 +0200 Message-Id: <1488207062-21156-2-git-send-email-cbrasho@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1488207062-21156-1-git-send-email-cbrasho@gmail.com> References: <[PATCH]> <1488207062-21156-1-git-send-email-cbrasho@gmail.com> In-Reply-To: <1487592306-6477-1-git-send-email-cbrasho@gmail.com> References: <1487592306-6477-1-git-send-email-cbrasho@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170227_065206_855037_176D74BB X-CRM114-Status: UNSURE ( 6.75 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:241 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (cbrasho[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH] procd.sh: use parrameterized respawn values X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Claudiu Brasovean MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Claudiu Brasovean --- package/system/procd/files/procd.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index 6347de5..9fbf47e 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -351,8 +351,10 @@ _procd_close_instance() { if json_select respawn ; then json_get_values respawn_vals if [ -z "$respawn_vals" ]; then + local respawn_threshold=$(uci_get system.@service[0].respawn_threshold) + local respawn_timeout=$(uci_get system.@service[0].respawn_timeout) local respawn_retry=$(uci_get system.@service[0].respawn_retry) - _procd_add_array_data 3600 5 ${respawn_retry:-5} + _procd_add_array_data ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5} fi json_select .. fi