From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4HS8OUBanmIzlwAAbAwnHQ (envelope-from ) for ; Mon, 06 Jun 2022 21:49:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id MGK2OUBanmJN3AAAauVa8A (envelope-from ) for ; Mon, 06 Jun 2022 21:49:20 +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 B6AB93FF00 for ; Mon, 6 Jun 2022 21:49:16 +0200 (CEST) Received: from localhost ([::1]:51752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyIix-0001Qe-TJ for larch@yhetil.org; Mon, 06 Jun 2022 15:49:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyIiv-0001Pp-GW for gwl-devel@gnu.org; Mon, 06 Jun 2022 15:49:13 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:60136) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyIis-00087I-J8 for gwl-devel@gnu.org; Mon, 06 Jun 2022 15:49:12 -0400 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 256Jn1ok029342 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 6 Jun 2022 15:49:08 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 256Jn1ok029342 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1654544948; bh=35diU3xftBAowZQyRJxPB2Qkk23nTHblmPlo+/56c2E=; h=From:To:Subject:Date:In-Reply-To:References:From; b=MMl1u1eobokuhodX/1HdZOT2OiobSvOz81Ml5obHCxcWjO4jHvKJZ4rfjRars+O7C vOcZ8o9wpqlAaJ/pW6vaad/mtwk9IvNLdGmCdjDOTXjecGAsuPnH1aUD1Snm52xFC6 Sm4E1kwI9vQveblidcuodZg806nDMzgXstH0v2X4= From: Olivier Dion To: Olivier Dion , gwl-devel@gnu.org Subject: [PATCH 1/3] gwl/ui: Check for log-events configuration Date: Mon, 6 Jun 2022 15:48:58 -0400 Message-Id: <20220606194900.27725-1-olivier.dion@polymtl.ca> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220603183203.11092-1-olivier.dion@polymtl.ca> References: <20220603183203.11092-1-olivier.dion@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Mon, 6 Jun 2022 19:49:01 +0000 Received-SPF: pass client-ip=132.207.4.11; envelope-from=olivier.dion@polymtl.ca; helo=smtp.polymtl.ca X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: gwl-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gwl-devel-bounces+larch=yhetil.org@gnu.org Sender: "gwl-devel" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1654544957; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=35diU3xftBAowZQyRJxPB2Qkk23nTHblmPlo+/56c2E=; b=k+Xm3KPQokof6aaLL11B+XBmu/4GMQj+Tbo2swlSO93DSfFUl5U8toTEW3LB1GxnGp2SAL CseIS1pz2Z+yn1F/ZA5NUf8/5v4bWQK18CoCFgLElaN/9i+xG3I07XdsRLlOj+LaIndT5t miHE+/yc8CKXY5+NO7tk3PL7uxyWG5FkbKKF95V4phkK8yImt8E+lWQM0vKnTUOWNxSX2r stsRlyDItnDuM5PSPy5Pk2rl9zLjgONSElowRF0FpZq7+ktK1RUGPaOVyVb5Ro4I9r49IM BkXbeeOTc8mO+J+UwyTprTTYec2U4BgWzA6BwmsR80I0sJT+CI1hKkbmFewBvw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654544957; a=rsa-sha256; cv=none; b=KePrBlFsSZnUNWhiNtww6V9jhHSe6ANsp1HRA3m7foGpHuqPDcMz1HDOogWJOBaTfIJgHV 7zV/O5SROCXDf8TmSSW/xBNwV3U9YQd4hQOYBeaqmhFU4DRMjVkDWc+3VcqBhb5QTAp8tI vCxccAEJNQ07eamtx+TDCJviW8NFkQlWufzCWRKsL7iNgox3Dw1WCWjKCMyxY2cYbiTWwa VtchuStHC+Pz/gm/Kmh0aULfu4S1SAgMwAYWXKDq4pADRkqeJITw3yc/ZQjX2cCR1WzWf3 /uPBLjn7vVgsSyj7uFkfRKm4IyolQScggmgzMujNtrOP8uuOFX3fre8NpppnMA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=polymtl.ca header.s=default header.b=MMl1u1eo; dmarc=pass (policy=quarantine) header.from=polymtl.ca; spf=pass (aspmx1.migadu.com: domain of "gwl-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="gwl-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -7.71 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=polymtl.ca header.s=default header.b=MMl1u1eo; dmarc=pass (policy=quarantine) header.from=polymtl.ca; spf=pass (aspmx1.migadu.com: domain of "gwl-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="gwl-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B6AB93FF00 X-Spam-Score: -7.71 X-Migadu-Scanner: scn0.migadu.com X-TUID: DdXH1mjljOlV Some GWL sub-commands might not accept the log-events switch. This results in returning `#f' from `(%config 'log-events)' Fix this by checking that 'log-events was configured. Also memoize the result. --- gwl/ui.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gwl/ui.scm b/gwl/ui.scm index 35bd127..bfe20a9 100644 --- a/gwl/ui.scm +++ b/gwl/ui.scm @@ -17,6 +17,8 @@ #:use-module (gwl config) #:use-module (gwl errors) #:use-module (guix colors) + #:use-module ((guix memoization) + #:select (mlambdaq)) #:use-module (srfi srfi-26) #:use-module (ice-9 format) #:export (G_ @@ -63,11 +65,16 @@ (format (current-error-port) "~a" (prefix-color prefix)))) +(define print? + (mlambdaq (type) + (let ((log-events (%config 'log-events))) + (and log-events + (or (member 'all log-events) + (member type log-events)) + #t)))) + (define (log-event type . message) - (define print? - (or (member 'all (%config 'log-events)) - (member type (%config 'log-events)))) - (when print? + (when (print? type) (case type ((error) (print-diagnostic-prefix (G_ "error: ") #:colors %error-color)) -- 2.36.1