From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id AHOQC7uZJWTM1QAASxT56A (envelope-from ) for ; Thu, 30 Mar 2023 16:16:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id wI+MCruZJWTThQEAG6o9tA (envelope-from ) for ; Thu, 30 Mar 2023 16:16:27 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8B50B3163E for ; Thu, 30 Mar 2023 16:16:26 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pht4R-0006pX-Fo; Thu, 30 Mar 2023 10:16:07 -0400 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 1pht4N-0006oV-B4 for guix-patches@gnu.org; Thu, 30 Mar 2023 10:16:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pht4M-0001bV-FG for guix-patches@gnu.org; Thu, 30 Mar 2023 10:16:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pht4M-0000Xo-4U for guix-patches@gnu.org; Thu, 30 Mar 2023 10:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62465] [PATCH v3 1/2] services: mcron: Add 'shepherd-requirement' field. References: <47e924fd42f74fc2800dc64399f7a069ad463515.1679854500.git.mirai@makinata.eu> In-Reply-To: <47e924fd42f74fc2800dc64399f7a069ad463515.1679854500.git.mirai@makinata.eu> Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 14:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62465 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62465@debbugs.gnu.org Cc: Bruno Victal , maxim.cournoyer@gmail.com Received: via spool by 62465-submit@debbugs.gnu.org id=B62465.16801857292046 (code B ref 62465); Thu, 30 Mar 2023 14:16:02 +0000 Received: (at 62465) by debbugs.gnu.org; 30 Mar 2023 14:15:29 +0000 Received: from localhost ([127.0.0.1]:59155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pht3o-0000Wv-KQ for submit@debbugs.gnu.org; Thu, 30 Mar 2023 10:15:29 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:42192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pht3n-0000Wo-DR for 62465@debbugs.gnu.org; Thu, 30 Mar 2023 10:15:27 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 48CCD20DEA; Thu, 30 Mar 2023 16:15:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id F1117800A0; Thu, 30 Mar 2023 16:15:25 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id pEGp2giG8Q6B; Thu, 30 Mar 2023 16:15:25 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6D08D8009E; Thu, 30 Mar 2023 16:15:25 +0200 (CEST) From: Bruno Victal Date: Thu, 30 Mar 2023 15:15:18 +0100 Message-Id: <4427884b06f47c6152b35e9559e6c1dc9412ebe5.1680185251.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680185787; a=rsa-sha256; cv=none; b=d6xvUGNolwBZwM62Yr4HCZT52d/T6cU0gI7gDnO4AegTcThShzWNXlJDDrOe6APkoaCW+g Iocj7ke6NVwd5+zeNIkF2frwhHMXEVphzjTXcJKLKlbf+kSgjih4PowUR0xjnOGKgpyuUl iak+aYZbzNPBYAd8Drisecozdirzbj5A7webQ7BmBfaC+FEr99wcZCEO3WM7xzxAuRDivD 3XQPtG0Tf2hQieHHq3UpXidbcM0/FPO3X4/2AjnJgdZYavNp9rNfM3timhsdX68SHAMJeW TS3PsjpEUTI+cedGgcXF5I63NC3l+i/ZN1e6IpBtxH79t7i8KXHFCPSDLmIVkg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680185787; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=ikgOCcI6SXyC6A7FO4h9kfaWz8wDTgCxVEIPj24xLp4=; b=pMBiB/momg2WpiNm8kTLbCCUIsco7fSIl0XRHAVoCRHQzErq3TzwJhgKKF6i0HLrmACici kHh4NQqgAFjdm1Xu8K+4fmUhyrByiCG5j+/KVQR0bC9mRrJxhCX/6fYkIS9nidpdl5jgH1 +L4CtEV/4seGoa95lMfc5qXFZCpPz4r9//9r9YnI3MU21pTG1tBd0ksGWkIypjjCK1zNDK JJ7he+vqxbrFZnuP2G+7u7zHyg4jArGUCvtV8UumeoMm9I4zGtRx3SxH78iH6ZR68nAEaj T37srr0Vs1n0tOSoLFb1tUP7NtOsy/2/YJ5JBwlwrafRfA88XIs2q+owSp+XMA== Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -2.72 X-Spam-Score: -2.72 X-Migadu-Queue-Id: 8B50B3163E X-TUID: sjoyglMW0J3U * gnu/services/mcron.scm (mcron-configuration)[shepherd-requirement]: New field. (list-of-symbols?): New predicate. (mcron-shepherd-services): Add support for additional shepherd requirements. * doc/guix.texi (Scheduled Job Execution): Update it. --- Notable changes from v2 to v3: Changing the final log-file value used in v2 behind the scenes made it poorly reflexive as you couldn't trust what the accessors returned. v3 makes log-file a mandatory field that has to be set manually and leaves the default service instantiation responsible for setting the default log-file that is used for the main mcron instance. doc/guix.texi | 4 ++++ gnu/services/mcron.scm | 13 +++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index c49e51b72e..5a597cf122 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19379,6 +19379,10 @@ Scheduled Job Execution @item @code{mcron} (default: @code{mcron}) (type: file-like) The mcron package to use. +@item @code{shepherd-requirement} (default: @code{()}) (type: list-of-symbols) +This is a list of symbols naming Shepherd services that this service +will depend on. + @item @code{jobs} (default: @code{()}) (type: list-of-gexps) This is a list of gexps (@pxref{G-Expressions}), where each gexp corresponds to an mcron job specification (@pxref{Syntax, mcron job diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm index 2ef5980e09..99eb0edd60 100644 --- a/gnu/services/mcron.scm +++ b/gnu/services/mcron.scm @@ -32,6 +32,7 @@ (define-module (gnu services mcron) #:export (mcron-configuration mcron-configuration? mcron-configuration-mcron + mcron-configuration-shepherd-requirement mcron-configuration-jobs mcron-configuration-log? mcron-configuration-log-file @@ -58,6 +59,9 @@ (define-module (gnu services mcron) (define list-of-gexps? (list-of gexp?)) +(define list-of-symbols? + (list-of symbol?)) + (define-maybe/no-serialization string) (define-configuration/no-serialization mcron-configuration @@ -65,6 +69,11 @@ (define-configuration/no-serialization mcron-configuration (file-like mcron) "The mcron package to use.") + (shepherd-requirement + (list-of-symbols '()) + "This is a list of symbols naming Shepherd services that this service +will depend on.") + (jobs (list-of-gexps '()) "This is a list of gexps (@pxref{G-Expressions}), where each gexp @@ -158,13 +167,13 @@ (define (shepherd-schedule-action mcron files) (define (mcron-shepherd-services config) (match-record config - (mcron jobs log? log-file log-format date-format) + (mcron shepherd-requirement jobs log? log-file log-format date-format) (if (eq? jobs '()) '() ;nothing to do (let ((files (job-files mcron jobs))) (list (shepherd-service (provision '(mcron)) - (requirement '(user-processes)) + (requirement `(user-processes ,@shepherd-requirement)) (modules `((srfi srfi-1) (srfi srfi-26) (ice-9 popen) ;for the 'schedule' action -- 2.39.1