Message ID | 20200713222150.4163551-1-danielb@meshplusplus.com |
---|---|
State | Accepted |
Delegated to: | Daniel Golle |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=meshplusplus.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=j0QVaLS5; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=meshplusplus-com.20150623.gappssmtp.com header.i=@meshplusplus-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=iDvPdPVj; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B5J7q3KnMz9s1x for <incoming@patchwork.ozlabs.org>; Tue, 14 Jul 2020 08:23:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=BSWmCEf9iO++OGOueP8mCh/myMZqcxLXQGXku2S9NRY=; b=j0QVaLS50+HNdYrdN97jexCA39 goL08HHnYJQt9wj98r8lO1BPgLlwunMOhEK8qin6J3bhNfnpKfIL5uFFbzZbEFbb2jS5NR5w8xQyu rBiGvzU7Z1qMG7xTrsh67cdXg5uG1cRQTx8HOOU7IGLvii6ymjJ3fr/RI74L9+SgTiNCdhhAodfGd YnOEEecECX/vT1S81yVWarvLw5KM8q5e2baH7k4MnxdtnAAxaAn28EN1hiSRfOJl4dZQUaOkOGBLL +XwpFYlNzvybnffUsd/3EIqYt7sBu1FXuObRzGC7Lk2+VOHkqaF+Eb3KjzR5xNZARG9MP5reSjCeF JZPh30SA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jv6pn-0002gz-Jj; Mon, 13 Jul 2020 22:22:03 +0000 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jv6pl-0002gG-5z for openwrt-devel@lists.openwrt.org; Mon, 13 Jul 2020 22:22:02 +0000 Received: by mail-pf1-x432.google.com with SMTP id m9so6679136pfh.0 for <openwrt-devel@lists.openwrt.org>; Mon, 13 Jul 2020 15:21:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meshplusplus-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=h6cO/WUC98D/YI+/r1eWY4Fd9wBFDMB46WN60zh4lU0=; b=iDvPdPVjTcyumfo5rWZXO9GKjZ2oY0Sng8Wn4e04X66nnFqFj+ydjEPkbwy1EuNvgD boyb8QTS+aqdWMhY3KAaINJpKgeuXVqepUPdNu4Z62Ltb9VEFsmpfcM7Ax4v53DsrDug 8tOYlzB4xQs8MpxJqS3meG2n4uc2GXzhdtzyy4ItOmZxpSQK3Y62ThE212N+9gCWZwp/ 6kuGf5/bbbQ8k+4y/jVXvA/IFiA3L3xqR6npSHQAh/u2ZaEUgeQCaHCNO+6P2wbnxSWx 5hWv5OYgKu7T0hF/zE8mgi34xoj7g5QKtzZnJNkgLO66Qwvu8nC3b+mJixbVYvRMKcgZ SpkA== 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:mime-version :content-transfer-encoding; bh=h6cO/WUC98D/YI+/r1eWY4Fd9wBFDMB46WN60zh4lU0=; b=fp740RSXDUBF8MD5xinqendy71lsDHAd1jOithKeLSgM8eJpcNcB9J/Z9ko6X4L5NQ O+1H2pfKVNDgwuAAMw829XTy1yofjaQISah+vWhPZ0UD0CnVOqCfIHoo++K2oapPKtXP wUbwPox4fJFD92DWiExxVFd+Xr+twayxxQY64kLs9NIKXb3QAVO7aCalhS51HBztiytj MfICgQVLeA2c3TmazfgdzOOQGX0ylcn0C7D8EcxEn2TZM+pooi1RYm5bGHx2aQm6J2a3 ruOZ4pBcRsqe1CmePLv8p6tAZpS5+PoOzuQmxlgV/InhK4xjGWWrP7M89F7+u8OHOj1T Fk0Q== X-Gm-Message-State: AOAM531bLQX2B9/QL8y/AN2AbqfnKGEC8suERTe8vF9wlllDTgabVoNv oPEu0yEo9Qdlno0x8lOImjkWB8L5NAc= X-Google-Smtp-Source: ABdhPJycl5S+7vRVZZVCScUPMZRRlzKLyGg6vMN5WQX1YHiPJMATGG1qIGaNDbvX8LFDvkbPq8Vw8A== X-Received: by 2002:a05:6a00:15c7:: with SMTP id o7mr1666482pfu.51.1594678916549; Mon, 13 Jul 2020 15:21:56 -0700 (PDT) Received: from grun.hsd1.or.comcast.net (c-67-160-156-165.hsd1.or.comcast.net. [67.160.156.165]) by smtp.gmail.com with ESMTPSA id f15sm14117374pgr.36.2020.07.13.15.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 15:21:55 -0700 (PDT) From: Daniel Bailey <danielb@meshplusplus.com> To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 2/2] procd: allow optional watchdog instance parameter Date: Mon, 13 Jul 2020 15:21:50 -0700 Message-Id: <20200713222150.4163551-1-danielb@meshplusplus.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200713_182201_277693_0749BA0A X-CRM114-Status: UNSURE ( 8.92 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:432 listed in] [list.dnswl.org] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Cc: Daniel Bailey <danielb@meshplusplus.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
[v2,1/2] procd: add service instance watchdog
|
expand
|
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index dd6dc1c58d..d86b7219da 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -247,7 +247,7 @@ _procd_set_param() { env|data|limits) _procd_add_table "$type" "$@" ;; - command|netdev|file|respawn|watch) + command|netdev|file|respawn|watch|watchdog) _procd_add_array "$type" "$@" ;; error) @@ -378,7 +378,7 @@ _procd_append_param() { env|data|limits) _procd_add_table_data "$@" ;; - command|netdev|file|respawn|watch) + command|netdev|file|respawn|watch|watchdog) _procd_add_array_data "$@" ;; error)
Optional instance watchdog timeout and watchdog mode can be set by adding: procd_set_param $mode $timeout $mode is an integer [0-1] representing instance watchdog mode of operation: 0 = disabled 1 = passive mode, client must periodically poke watchdog via ubus $timeout is an integer representing how often, in seconds, the watchdog must be poked. Signed-off-by: Daniel Bailey <danielb@meshplusplus.com> --- package/system/procd/files/procd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)