From patchwork Fri Dec 15 21:02:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 57623 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 8E17F27BBEA; Fri, 15 Dec 2023 21:03:36 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 218DB27BBE2 for ; Fri, 15 Dec 2023 21:03:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEFL5-0000uh-Vd; Fri, 15 Dec 2023 16:03:20 -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 1rEFKq-0000re-Kk for guix-patches@gnu.org; Fri, 15 Dec 2023 16:03:05 -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 1rEFKp-0006NC-B4 for guix-patches@gnu.org; Fri, 15 Dec 2023 16:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rEFKp-0003US-2j for guix-patches@gnu.org; Fri, 15 Dec 2023 16:03:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67842] [PATCH 3/4] services: mympd: Fix syslog logging and missing service destructor. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Dec 2023 21:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67842@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 67842-submit@debbugs.gnu.org id=B67842.170267417813383 (code B ref 67842); Fri, 15 Dec 2023 21:03:03 +0000 Received: (at 67842) by debbugs.gnu.org; 15 Dec 2023 21:02:58 +0000 Received: from localhost ([127.0.0.1]:53644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEFKj-0003Ti-O6 for submit@debbugs.gnu.org; Fri, 15 Dec 2023 16:02:58 -0500 Received: from smtpm2.myservices.hosting ([185.26.105.233]:44112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEFKh-0003TX-UZ for 67842@debbugs.gnu.org; Fri, 15 Dec 2023 16:02:56 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 9410620E87 for <67842@debbugs.gnu.org>; Fri, 15 Dec 2023 22:02:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id CCD7F80098; Fri, 15 Dec 2023 22:02:50 +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 1Yf0Wc3-Lfp5; Fri, 15 Dec 2023 22:02:50 +0100 (CET) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 63B3D80067; Fri, 15 Dec 2023 22:02:50 +0100 (CET) From: Bruno Victal Date: Fri, 15 Dec 2023 21:02:38 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 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 * gnu/services/audio.scm: (mympd-shepherd-service): Fix syslog logging and missing service destructor. Prefer list over quasiquote. --- gnu/services/audio.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index ae991ced4d..4fcfcc13ea 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -938,14 +938,15 @@ (define (mympd-shepherd-service config) cache-directory))))) (make-forkexec-constructor - `(#$(file-append package "/bin/mympd") - "--user" #$username - #$@(if (eq? log-to 'syslog) '("--syslog") '()) - "--workdir" #$work-directory - "--cachedir" #$cache-directory) + (list #$(file-append package "/bin/mympd") + "--user" #$username + #$@(if (maybe-value-set? log-to) '() '("--syslog")) + "--workdir" #$work-directory + "--cachedir" #$cache-directory) #:environment-variables (list #$(format #f "MYMPD_LOGLEVEL=~a" log-level)) - #:log-file #$(maybe-value log-to))))))))) + #:log-file #$(maybe-value log-to)))))) + (stop #~(make-kill-destructor))))) (define (mympd-accounts config) (match-record config (user group)