From patchwork Fri Feb 4 08:07:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 36996 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 58AC827BBEA; Fri, 4 Feb 2022 16:25:35 +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.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 DEA3627BBE9 for ; Fri, 4 Feb 2022 16:25:34 +0000 (GMT) Received: from localhost ([::1]:59080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG1Ov-0006pm-VQ for patchwork@mira.cbaines.net; Fri, 04 Feb 2022 11:25:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG1Lj-0002uc-1o for guix-patches@gnu.org; Fri, 04 Feb 2022 11:22:15 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG1LW-0005wG-7X for guix-patches@gnu.org; Fri, 04 Feb 2022 11:22:14 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nG1LV-0001vb-Uf for guix-patches@gnu.org; Fri, 04 Feb 2022 11:22:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53781] [PATCH shepherd] support: Use XDG_STATE_HOME for log files. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Feb 2022 16:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53781 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53781@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16439917077387 (code B ref -1); Fri, 04 Feb 2022 16:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Feb 2022 16:21:47 +0000 Received: from localhost ([127.0.0.1]:60901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG1LG-0001v5-SO for submit@debbugs.gnu.org; Fri, 04 Feb 2022 11:21:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:54586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG1LF-0001uy-8w for submit@debbugs.gnu.org; Fri, 04 Feb 2022 11:21:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG1LF-0002V6-1p for guix-patches@gnu.org; Fri, 04 Feb 2022 11:21:45 -0500 Received: from [2a00:1450:4864:20::642] (port=37451 helo=mail-ej1-x642.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG1LC-0005pS-DE for guix-patches@gnu.org; Fri, 04 Feb 2022 11:21:44 -0500 Received: by mail-ej1-x642.google.com with SMTP id ah7so20835675ejc.4 for ; Fri, 04 Feb 2022 08:21:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=uC2G/41eDVlOuBOZjkgMABAR0m6iOo+64NhD1jQN4SE=; b=TVDZDYHG38uesswiV+RrZqqQoFgltJPIr9dauKrUMaVYLBo4UH+aTIbqW019RJn6Gm In6iE3xxGBqlQpDKUSion6DXHujxGxNaKatsXF8v99f3GgMlkA+VORfWAyb6mdF3c2kC +GF8Eb8heZ8E9+GE0JM40tHRdtWPGfK2+5bTSUbcwjJIdaZfdHxIMZx+bAAeELg/8gvp mHE72clZvdSdsebJWpEpfTUrch3i4fMV9yLLLCGdlFUCKWG/RCQdEC2dHI2THarZrlpC OuOrLOrX1PpJLZ4lssRcjS5O0HZRMxC5gC859EiO7ndt8SBlZjauUx2EvKz7kp4GUavi k3BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=uC2G/41eDVlOuBOZjkgMABAR0m6iOo+64NhD1jQN4SE=; b=EKh0N46GWM87bzyOnslwuidC52IfM+CZgiytOG2aD35geJhfygPlbAGTuVffqTlwL4 Nxf3/uYMLlsjZ0JRCb56WwDg8fa33Rv/oY53VijNrIehOdRuItE+bT1k5beE1MPZFkqS DE1t61ceiPJhpFqXeu+QXickZ9P1LVHmeK2NbcOtbADmW+6aKELwg+NeLT4NevMvupZE 8VHanqk2tA70rnl2MWjrBVQJ7k6CNMm+tQNBo+wvNfh8Yj7XaLRUBNXAyEzRC7v/HNLq ltjKadROwRiqIjZVrlHOoJQV+EEgCte2IbVLKtk8xNl/QTeMcFb723rYtjv2ziYveDET GsQw== X-Gm-Message-State: AOAM530+KsKtV9L5FRzM/cAiT2wNCAR2/IIpHA6aToB1r2OJkD0h4WJU pjOpwuXfMyjGPQ33qXpHYI+7yO0+Q3o= X-Google-Smtp-Source: ABdhPJxswq2tefbCSBaXel3u2CAGgl3HfAfEP/tnCZR6n/IksN9JnYaldh+OJeSp7HQOG10BIlTQhg== X-Received: by 2002:a17:907:7b87:: with SMTP id ne7mr3167588ejc.556.1643991700546; Fri, 04 Feb 2022 08:21:40 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g7sm1019555edr.71.2022.02.04.08.21.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 08:21:39 -0800 (PST) From: Liliana Marie Prikler Date: Fri, 4 Feb 2022 09:07:09 +0100 Message-ID: <062d00aaa485dd2c8524f6822a524cb3cb3bdc55.camel@gmail.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::642 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::642; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x642.google.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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" X-getmail-retrieved-from-mailbox: Patches As per XDG Base Directory Specification 0.8, "action history" (such as logs) ought to be stored in $XDG_STATE_HOME, defaulting to $HOME/.local/state. Respect this specification. * modules/shepherd/support.scm (%user-log-dir): Define in terms of XDG_STATE_HOME. * doc/shepherd.texi: Adjust accordingly. * tests/basic.sh: Adjust accordingly. --- doc/shepherd.texi | 3 ++- modules/shepherd/support.scm | 4 ++-- tests/basic.sh | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/shepherd.texi b/doc/shepherd.texi index 94f6131..b779a5f 100644 --- a/doc/shepherd.texi +++ b/doc/shepherd.texi @@ -419,7 +419,8 @@ permissions are not as expected. Log output into @var{file}. For unprivileged users, the default log file is -@file{$XDG_DATA_DIR/.local/share/shepherd/shepherd.log}. +@file{$XDG_STATE_HOME/shepherd/shepherd.log} with @file{$XDG_STATE_HOME} +defaulting to @file{$HOME/.local/state}. @cindex syslog When running as root, the default behavior is to connect to diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm index 21c59f7..72b74ba 100644 --- a/modules/shepherd/support.scm +++ b/modules/shepherd/support.scm @@ -277,8 +277,8 @@ There is NO WARRANTY, to the extent permitted by law."))) (define %user-log-dir ;; Default log directory if shepherd is run as a normal user. - (string-append (or (getenv "XDG_DATA_DIR") - (string-append user-homedir "/.local/share")) + (string-append (or (getenv "XDG_STATE_HOME") + (string-append user-homedir "/.local/state")) "/shepherd")) (define %user-runtime-dir diff --git a/tests/basic.sh b/tests/basic.sh index 5079aa1..5ef1fb0 100644 --- a/tests/basic.sh +++ b/tests/basic.sh @@ -260,7 +260,9 @@ test -f "$log" # Set XDG_CONFIG_HOME for configuration files. export XDG_CONFIG_HOME=$confdir -export XDG_DATA_DIR=$datadir +export XDG_DATA_HOME=$datadir +# Reuse XDG_DATA_HOME as XDG_STATE_HOME for backwards compatibility. +export XDG_STATE_HOME=$datadir mkdir -p $confdir/shepherd mkdir -p $datadir/shepherd mv $conf $confdir/shepherd/init.scm