From patchwork Wed May 1 05:23:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1093590 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JshlOxqD"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jvtnvaIU"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::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 44v6Jy1BpSz9sB3 for ; Wed, 1 May 2019 15:24:33 +1000 (AEST) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date: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=DJIrjvU6LNaApwVf1jdvwfi7mS4yDg2ZkYBi6Q2P+Ck=; b=JshlOxqDYG1YOa kvHjYlOsuex7cJ+mk63iIQFDrA0SvEgbCUWrCC+iXqaJzOC3aCrzFMwnc02TmCisoinYygOAMqXtf 0MUfuzG3AQJGcqB2NVUIDfAJHFYMdL39+0+pPmUcyHrb7vlwdDseAHw4YKC3I5f9lN9NySdy6H5F4 rClmegQGK+wG2fPFBvWdQEf613C18tLDrXL9h4eDfDUp1W3j5g7AdUYRZUudAnvLs3QC7PYMXbZeb knGRTwGtsdmwjDIWSfXB3oOgRTGxiQ2YFEH/Y+iobM7mu28jThhyzmlmzo/xQpoWJ7QnSmu86JU84 O9ZAyKfiNBSpazx+7MJg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hLhiu-0004li-VD; Wed, 01 May 2019 05:24:04 +0000 Received: from mail-lf1-x142.google.com ([2a00:1450:4864:20::142]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hLhip-0004lR-4G for openwrt-devel@lists.openwrt.org; Wed, 01 May 2019 05:24:00 +0000 Received: by mail-lf1-x142.google.com with SMTP id v1so12493268lfg.5 for ; Tue, 30 Apr 2019 22:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Z/vltGtWHixWJJ066LHP1cCedPpX3ZzOMZtBuzomBKI=; b=jvtnvaIU+BM/zVXE54K3TloXx5Bh1EjU2m7UMXi2pF0krsWHW9oVyTe9NigqrHRU/J 6KeevQtO2gpYeOnwZtipPww7L1WgxUGu/9zp61M0eCJgHhn7gRjJ1dE+fY+p6NhCopCl ryLION6IBf/xJ6Kmcymd+o72VO+b2pIPvDg7AbeFLaw1IghGsZo4m3v9L7LLSMgINzRl 1JWo7CHgvDAxRsIiK7o+PcuBYfCifUjQF1il1xMpk3DPniKiuy4VRQkH8gIXuuRNYgdo VV1/9IxlFRx8zKGuz+C9IZNpVMg4WysDtqVyhK2NRqpBPD8XvDWLO8L8bTDW6yN8hqhP artg== 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=Z/vltGtWHixWJJ066LHP1cCedPpX3ZzOMZtBuzomBKI=; b=l/rn+Y/2UvtGW6/QdlEsTHM3LwD98mC1syLHWlqrz9t/tvO5oCAk9SnLkkr1B8uHYp n5rLWN2wq+4ZbIdXvCrQIQGnzDB8CgCR9JDJeqdbRdvBFBhSc6kXYthZg2rwaKPKlMLI +llJSp3GKN6dcHywfRyTmagrEo9/uqKFlS/y4dH2FmYW6p8ZgDz2+FOBNc1yALwQOsfJ RdwGFBqdTpT9K+cPRYDMTwdDdOisljzEYcXLPh3vXUzoIrZnxtnlBtQjbJPkSZKpUPtM ix227YpabggqOWT7jm2oquP2Yvve9KYVoYdZxAwhy2MT2OfXSKJA2R6WmCo/Wl9km1V9 HBvQ== X-Gm-Message-State: APjAAAUJuZjvlvP4Xbu7AFfH0/fhuHUE5neEJw5O8jhA6gr7FnauCgIS nBjFvuiaTb/wpLU2wLbRj7j6c5nXntk= X-Google-Smtp-Source: APXvYqxf4PW+NKNW4X/fzd2eX9wG2jApG9bZR7PkKNxPhjCPkN7tjVfkO8SVlu1iQczH4bhlhJBOLA== X-Received: by 2002:a19:6b0d:: with SMTP id d13mr37147176lfa.79.1556688236550; Tue, 30 Apr 2019 22:23:56 -0700 (PDT) Received: from elitebook.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id k4sm5017469lja.18.2019.04.30.22.23.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Apr 2019 22:23:55 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Date: Wed, 1 May 2019 07:23:21 +0200 Message-Id: <20190501052321.11985-1-zajec5@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190430_222359_194783_1DC78F39 X-CRM114-Status: UNSURE ( 8.31 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:142 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [OpenWrt-Devel] [PATCH] procd: add procd_running() helper for checking running state X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , John Crispin Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki This should be helpful for implementing service_running() in procd init scripts. Signed-off-by: Rafał Miłecki Acked-by: John Crispin --- package/system/procd/files/procd.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index 72f25fe0c0..ade55a344f 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -26,6 +26,9 @@ # procd_close_instance(): # Complete the instance being prepared # +# procd_running(service, [instance]): +# Checks if service/instance is currently running +# # procd_kill(service, [instance]): # Kill a service instance (or all instances) # @@ -398,6 +401,18 @@ _procd_add_instance() { _procd_close_instance } +procd_running() { + local service="$1" + local instance="${2:-instance1}" + local running + + json_init + json_add_string name "$service" + running=$(_procd_ubus_call list | jsonfilter -e "@.$service.instances.${instance}.running") + + [ "$running" = "true" ] +} + _procd_kill() { local service="$1" local instance="$2"