From patchwork Mon Jan 15 10:43:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 58882 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7816427BBEA; Mon, 15 Jan 2024 10:45:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8E52727BBE9 for ; Mon, 15 Jan 2024 10:45:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPKSo-0007ug-8O; Mon, 15 Jan 2024 05:45:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPKSm-0007tk-OD for guix-patches@gnu.org; Mon, 15 Jan 2024 05:45:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rPKSl-0003up-0c for guix-patches@gnu.org; Mon, 15 Jan 2024 05:45:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPKSk-0007vB-At for guix-patches@gnu.org; Mon, 15 Jan 2024 05:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68468] [PATCH] gnu: services: Add respawn-limit and respawn-delay. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Jan 2024 10:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68468 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68468@debbugs.gnu.org Cc: Attila Lendvai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170531549430381 (code B ref -1); Mon, 15 Jan 2024 10:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jan 2024 10:44:54 +0000 Received: from localhost ([127.0.0.1]:44780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPKSb-0007tx-OL for submit@debbugs.gnu.org; Mon, 15 Jan 2024 05:44:54 -0500 Received: from lists.gnu.org ([2001:470:142::17]:35004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPKSY-0007th-TU for submit@debbugs.gnu.org; Mon, 15 Jan 2024 05:44:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPKSR-0007i5-N1 for guix-patches@gnu.org; Mon, 15 Jan 2024 05:44:44 -0500 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rPKSQ-0003rE-3z for guix-patches@gnu.org; Mon, 15 Jan 2024 05:44:43 -0500 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-559565b3b58so648697a12.1 for ; Mon, 15 Jan 2024 02:44:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705315480; x=1705920280; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7piVBnrFbKyAxCKJVCTiJonPs1ggHTCIWFDMHnZQGJA=; b=BfOPLCokn3LszzosvnfuZ/pN/fZ4Ek5w0rCBDzK0tB1Z62t2MhQPjfdpGEkdGBwHd4 6WBY/2KGYxrNVMXSH+PAhggt/mBp7MFPdSZLsb2Mgf5JqC+MNZZglJsbZrs67Xmv7fVO TBhvawwBKOm+eZIAjW/PWE8d0bVJz+mJutPvFJQaGE/gDp8tozKUNwBlL3hkNP8aYRnV QErSc3dTn4Y+Xmgkp+GmWatbhln0Skl09Ai9PJNqZfyexTzNVEHZuYPPCOfqzISpTLA/ KVvuly9uALGbCC7L/Zlmhl0w17VhDEeabWplWBmnSRwqkJ/MwSJR4YbyOgL7POFbYfTT 2tMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705315480; x=1705920280; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7piVBnrFbKyAxCKJVCTiJonPs1ggHTCIWFDMHnZQGJA=; b=EPUUvuV4EQRKd9+DJlSN1rT9N7IyKDsKgFQ4mgZ5e7Zbvcv8/vf1PhYNw6ZRc3Dwzs W1ICqOY1gys4SxuICs7qEASrw7Grzz5slixx54dZ2ZCmD/MzXuwTyNOo4ph6V1b6QIG3 umjyLpwz7jHpJviQHW9hrxSxaaLErLtP29M543CfsgldESTo121ADDtOsd7K2em8GFuA a5iLzA+YyiaNeRZVxwb71ESXgXJPgZhqTLcEqb+z01wWjRT7XQ9LzTl8LQRe8xhH1kMn kf792l4wmPSBd/+GZuYTYfQb+fKGuPnPvbzkjrspb9Pb5p4Kls+TcCExz9xCcvAfJikx /jjg== X-Gm-Message-State: AOJu0YzI/Yh1zK6XzAC2131lHyQ87NhpASgDHwD0XBFnThGygc1LDEWj lYoROEpuw9onG1ddMOTkVoqazsm4weQ= X-Google-Smtp-Source: AGHT+IHZuP1NNswhf6JlKTeyED/ataB+Qj0eGBpZKMg5UblWcqOsc62TJEy4KlPYGy2tGOSCNAtUoA== X-Received: by 2002:aa7:c69a:0:b0:558:9a77:63ec with SMTP id n26-20020aa7c69a000000b005589a7763ecmr2577881edq.47.1705315480013; Mon, 15 Jan 2024 02:44:40 -0800 (PST) Received: from lelap.lan (2a00-1f40-b161-d20--9a4.pool6.panelnet.hu. [2a00:1f40:b161:d20::9a4]) by smtp.gmail.com with ESMTPSA id n14-20020a056402060e00b0055344b92fb6sm5299283edv.75.2024.01.15.02.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 02:44:39 -0800 (PST) From: Attila Lendvai X-Google-Original-From: Attila Lendvai Date: Mon, 15 Jan 2024 11:43:47 +0100 Message-ID: <288643093baa2855c7b5f8cf1d9f6da2b378f965.1705315426.git.attila@lendvai.name> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/shepherd.scm (): Add respawn-limit and respawn-delay. Change-Id: I54408e8fb4bcc0956d9610771bf5c566fdc2914c --- gnu/services/shepherd.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) base-commit: 162d6a2fdd6af13272967c77347a54934ecb45e6 prerequisite-patch-id: 2adcd37ab1f0752ec27a4edabbabe1c65d88f122 diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 5ebac129cec..f5bcde721fe 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -55,6 +55,8 @@ (define-module (gnu services shepherd) shepherd-service-canonical-name shepherd-service-requirement shepherd-service-one-shot? + shepherd-service-respawn-limit + shepherd-service-respawn-delay shepherd-service-respawn? shepherd-service-start shepherd-service-stop @@ -211,6 +213,10 @@ (define-record-type* (default #f)) (respawn? shepherd-service-respawn? ;Boolean (default #t)) + (respawn-limit shepherd-service-respawn-limit + (default #f)) + (respawn-delay shepherd-service-respawn-delay + (default #f)) (start shepherd-service-start) ;g-expression (procedure) (stop shepherd-service-stop ;g-expression (procedure) (default #~(const #f))) @@ -309,6 +315,14 @@ (define (shepherd-service-file service) #:one-shot? '#$(shepherd-service-one-shot? service) #:respawn? '#$(shepherd-service-respawn? service) + #$@(if (shepherd-service-respawn-limit service) + `(#:respawn-limit + ,(shepherd-service-respawn-limit service)) + '()) + #$@(if (shepherd-service-respawn-delay service) + `(#:respawn-delay + ,(shepherd-service-respawn-delay service)) + '()) #:start #$(shepherd-service-start service) #:stop #$(shepherd-service-stop service) #:actions