From patchwork Mon Mar 13 19:30:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47947 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 0CF6C16E3D; Mon, 13 Mar 2023 19:31:41 +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=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 5ACF316E04 for ; Mon, 13 Mar 2023 19:31:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbnsx-0003EI-BV; Mon, 13 Mar 2023 15:31: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 1pbnst-0003Cq-0f for guix-patches@gnu.org; Mon, 13 Mar 2023 15:31: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 1pbnss-0008N7-KZ for guix-patches@gnu.org; Mon, 13 Mar 2023 15:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbnss-0003Hr-GD for guix-patches@gnu.org; Mon, 13 Mar 2023 15:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62169] [PATCH 1/3] services: mcron: Restyle mcron-configuration. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Mar 2023 19:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62169@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 62169-submit@debbugs.gnu.org id=B62169.167873585912612 (code B ref 62169); Mon, 13 Mar 2023 19:31:02 +0000 Received: (at 62169) by debbugs.gnu.org; 13 Mar 2023 19:30:59 +0000 Received: from localhost ([127.0.0.1]:35663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbnsp-0003HM-0u for submit@debbugs.gnu.org; Mon, 13 Mar 2023 15:30:59 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]:59588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbnsm-0003H2-QS for 62169@debbugs.gnu.org; Mon, 13 Mar 2023 15:30:57 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id 4275F20FB2 for <62169@debbugs.gnu.org>; Mon, 13 Mar 2023 20:30:56 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id E4A3E800A4; Mon, 13 Mar 2023 20:30:52 +0100 (CET) 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 too7TPuiRYE9; Mon, 13 Mar 2023 20:30:52 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6E30B800A0; Mon, 13 Mar 2023 20:30:52 +0100 (CET) From: Bruno Victal Date: Mon, 13 Mar 2023 19:30:48 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 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 * doc/guix.texi (Scheduled Job Execution): Sync doc with source. * gnu/services/mcron.scm (mcron-configuration): Restyle. [log-format]: Fix incorrectly formatted text. --- doc/guix.texi | 2 +- gnu/services/mcron.scm | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 39932d5aad..45d96b8fbb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19349,7 +19349,7 @@ Scheduled Job Execution @item @code{log-format} (default: @code{"~1@@*~a ~a: ~a~%"}) (type: string) @code{(ice-9 format)} format string for log messages. The default value -produces messages like "@samp{@var{pid} @var{name}: @var{message}"} +produces messages like @samp{@var{pid} @var{name}: @var{message}} (@pxref{Invoking mcron, Invoking,, mcron,GNU@tie{}mcron}). Each message is also prefixed by a timestamp by GNU Shepherd. diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm index 52332d6123..6ee333f253 100644 --- a/gnu/services/mcron.scm +++ b/gnu/services/mcron.scm @@ -56,18 +56,25 @@ (define list-of-gexps? (list-of gexp?)) (define-configuration/no-serialization mcron-configuration - (mcron (file-like mcron) "The mcron package to use.") + (mcron + (file-like mcron) + "The mcron package to use.") + (jobs (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 specifications,, mcron, GNU@tie{}mcron}).") - (log? (boolean #t) "Log messages to standard output.") + + (log? + (boolean #t) + "Log messages to standard output.") + (log-format (string "~1@*~a ~a: ~a~%") "@code{(ice-9 format)} format string for log messages. The default value -produces messages like \"@samp{@var{pid} @var{name}: -@var{message}\"} (@pxref{Invoking mcron, Invoking,, mcron, GNU@tie{}mcron}). +produces messages like @samp{@var{pid} @var{name}: @var{message}} +(@pxref{Invoking mcron, Invoking,, mcron, GNU@tie{}mcron}). Each message is also prefixed by a timestamp by GNU Shepherd.")) (define (job-files mcron jobs)