From patchwork Thu Dec 3 09:53:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Eckert X-Patchwork-Id: 1410274 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=dev.tdt.de 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=L74pJLnM; 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 4CmrpB6yJlz9sT5 for ; Thu, 3 Dec 2020 20:56:34 +1100 (AEDT) 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=rgLgj1gc+LeGdXufXm2J7tcAatoAiXP+L38JXMae7AY=; b=L74pJLnMcBqI4CMXfXBLvftmO8 XrOU3hYB8aLj4UEfw5tbaH00wrM7JA7HADuZsClmK1K6WF4wQJKJAsEsB5px9SnWXNtw7/cXXIwzY GeVAoi2DZBtKTxB6Xx3MDXaFND0Y8bXFUwOZcgua70K4/Q0lG0gScBLIR8unF/X23IkF0rEjYWd3l NvmJUDVv38K26WeoLUVFZB74W9bwKQ+bSNPgIyDBtN3suk+IuQDFQo87MVJu4LCKNXlMZhk1oll2N aDzydVlCDYI72+PL9IXaRCU3a4sO/DvMWq7Y6ZkERYXLPHre83gd1PR7xnyTDl7ldiqdlaVo2ESlf Rd8uxXJw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kklJb-00081Q-Pp; Thu, 03 Dec 2020 09:54:19 +0000 Received: from mxout70.expurgate.net ([91.198.224.70]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kklJZ-0007zm-LR for openwrt-devel@lists.openwrt.org; Thu, 03 Dec 2020 09:54:18 +0000 Received: from [127.0.0.1] (helo=localhost) by relay.expurgate.net with smtp (Exim 4.92) (envelope-from ) id 1kklJS-000HDU-MZ; Thu, 03 Dec 2020 10:54:10 +0100 Received: from [195.243.126.94] (helo=securemail.tdt.de) by relay.expurgate.net with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kklJR-000Ery-Pf; Thu, 03 Dec 2020 10:54:09 +0100 Received: from securemail.tdt.de (localhost [127.0.0.1]) by securemail.tdt.de (Postfix) with ESMTP id 7F190240041; Thu, 3 Dec 2020 10:54:09 +0100 (CET) Received: from mail.dev.tdt.de (unknown [10.2.4.42]) by securemail.tdt.de (Postfix) with ESMTP id 14E42240040; Thu, 3 Dec 2020 10:54:09 +0100 (CET) Received: from feckert.dev.tdt.de (unknown [10.2.3.40]) by mail.dev.tdt.de (Postfix) with ESMTPSA id 804FF20046; Thu, 3 Dec 2020 10:54:08 +0100 (CET) From: Florian Eckert To: daniel@makrotopia.org, john@phrozen.org Subject: [PATCH v2 5/5] procd: add api wrapper Date: Thu, 3 Dec 2020 10:53:59 +0100 Message-ID: <20201203095359.11573-1-fe@dev.tdt.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.dev.tdt.de X-purgate-type: clean X-purgate: clean X-purgate-ID: 151534::1606989250-00001F6B-955C5C27/0/0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201203_045417_814012_D80A848E X-CRM114-Status: GOOD ( 10.86 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 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.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [91.198.224.70 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: openwrt-devel@lists.openwrt.org, aaronjg@alumni.stanford.edu, Florian Eckert , Florian.Eckert@googlemail.com Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This commit adds the functions `procd_add_service_trigger` and `procd_add_restart_service_trigger`. In order for the service to be triggered by another service during a restart, only the function procd_add_restart_service_trigger is needed. Example: service_trigger() { procd add_restart_service_trigger 'firewall' } If the firewall is restarted, the specified will be executed. Signed-off-by: Florian Eckert --- Changes since v1: - Augment procd_add_service_trigger with procd_add_restart_service_trigger package/system/procd/files/procd.sh | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index d86b7219da..007c99fca0 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -329,6 +329,37 @@ _procd_add_config_trigger() { json_close_array } +_procd_add_service_trigger() { + json_add_array + _procd_add_array_data "$1" + shift + + json_add_array + _procd_add_array_data "if" + + json_add_array + _procd_add_array_data "eq" "service" "$1" + shift + json_close_array + + json_add_array + _procd_add_array_data "run_script" "$@" + json_close_array + + json_close_array + _procd_add_timeout + json_close_array +} + +_procd_add_restart_service_trigger() { + local service=$1 + shift + + _procd_open_trigger + _procd_add_service_trigger "service.restart" "$service" "$@" + _procd_close_trigger +} + _procd_add_raw_trigger() { json_add_array _procd_add_array_data "$1" @@ -559,6 +590,8 @@ _procd_wrapper \ procd_add_instance \ procd_add_raw_trigger \ procd_add_config_trigger \ + procd_add_service_trigger \ + procd_add_restart_service_trigger \ procd_add_interface_trigger \ procd_add_reload_trigger \ procd_add_reload_interface_trigger \