From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A2BCF68B81 for ; Wed, 11 Nov 2020 13:41:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 987D92C224 for ; Wed, 11 Nov 2020 13:41:09 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 7B2F62C21A for ; Wed, 11 Nov 2020 13:41:08 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4341644B37 for ; Wed, 11 Nov 2020 13:41:08 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 11 Nov 2020 13:41:07 +0100 Message-Id: <20201111124107.1365-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.372 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [syslog.rs, node.rs, services.rs] Subject: [pbs-devel] [PATCH proxmox-backup] api2/node/syslog: use 'real_service_name' here also X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2020 12:41:39 -0000 for now this only does the 'postfix' -> 'postfix@-' conversion, fixes the issue that we only showed the 'postfix' service syslog (which is rather empty in a default setup) instead of the instance one Signed-off-by: Dominik Csapak --- src/api2/node.rs | 2 +- src/api2/node/services.rs | 2 +- src/api2/node/syslog.rs | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/api2/node.rs b/src/api2/node.rs index a19bea7e..6c3e7967 100644 --- a/src/api2/node.rs +++ b/src/api2/node.rs @@ -34,7 +34,7 @@ pub mod subscription; pub(crate) mod rrd; mod journal; -mod services; +pub(crate) mod services; mod status; mod syslog; mod time; diff --git a/src/api2/node/services.rs b/src/api2/node/services.rs index 4c2a17b4..40520208 100644 --- a/src/api2/node/services.rs +++ b/src/api2/node/services.rs @@ -22,7 +22,7 @@ static SERVICE_NAME_LIST: [&str; 7] = [ "systemd-timesyncd", ]; -fn real_service_name(service: &str) -> &str { +pub fn real_service_name(service: &str) -> &str { // since postfix package 3.1.0-3.1 the postfix unit is only here // to manage subinstances, of which the default is called "-". diff --git a/src/api2/node/syslog.rs b/src/api2/node/syslog.rs index 28a79469..56662805 100644 --- a/src/api2/node/syslog.rs +++ b/src/api2/node/syslog.rs @@ -134,12 +134,18 @@ fn get_syslog( mut rpcenv: &mut dyn RpcEnvironment, ) -> Result { + let service = if let Some(service) = param["service"].as_str() { + Some(crate::api2::node::services::real_service_name(service)) + } else { + None + }; + let (count, lines) = dump_journal( param["start"].as_u64(), param["limit"].as_u64(), param["since"].as_str(), param["until"].as_str(), - param["service"].as_str())?; + service)?; rpcenv["total"] = Value::from(count); -- 2.20.1