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 F307A8C6A for ; Tue, 7 Mar 2023 09:41:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CB1049762 for ; Tue, 7 Mar 2023 09:41:00 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Tue, 7 Mar 2023 09:41:00 +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 05A4541DE3 for ; Tue, 7 Mar 2023 09:41:00 +0100 (CET) Date: Tue, 7 Mar 2023 09:40:59 +0100 From: Wolfgang Bumiller To: Fabian =?utf-8?Q?Gr=C3=BCnbichler?= Cc: pbs-devel@lists.proxmox.com Message-ID: <20230307084059.nwv7zmwpdv25w2k2@fwblub> References: <20230303113924.389256-1-f.gruenbichler@proxmox.com> <20230303113924.389256-4-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230303113924.389256-4-f.gruenbichler@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.183 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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. [sync.rs] Subject: Re: [pbs-devel] [PATCH proxmox 3/4] http: sync: derive default user-agent from crate version 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: Tue, 07 Mar 2023 08:41:31 -0000 On Fri, Mar 03, 2023 at 12:39:23PM +0100, Fabian Grünbichler wrote: > Signed-off-by: Fabian Grünbichler > --- > if we want a fall back in case rustc is called manually, not by cargo, we could > also use option_env!.. > > proxmox-http/src/client/sync.rs | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/proxmox-http/src/client/sync.rs b/proxmox-http/src/client/sync.rs > index 228f839..3485f84 100644 > --- a/proxmox-http/src/client/sync.rs > +++ b/proxmox-http/src/client/sync.rs > @@ -7,8 +7,6 @@ use http::Response; > use crate::HttpClient; > use crate::HttpOptions; > > -pub const DEFAULT_USER_AGENT_STRING: &str = "proxmox-sync-http-client/0.1"; > - > #[derive(Default)] > /// Blocking HTTP client for usage with [`HttpClient`]. > pub struct Client { > @@ -23,12 +21,10 @@ impl Client { > fn agent(&self) -> Result { > let mut builder = ureq::AgentBuilder::new(); > > - builder = builder.user_agent( > - self.options > - .user_agent > - .as_deref() > - .unwrap_or(DEFAULT_USER_AGENT_STRING), > - ); > + builder = builder.user_agent(self.options.user_agent.as_deref().unwrap_or(&format!( > + "proxmox-sync-http-client/{}", > + env!("CARGO_PKG_VERSION") > + ))); I just realized too late that here this could actually use `concat!()` instead of `&format!` to avoid the extra allocation. > > if let Some(proxy_config) = &self.options.proxy_config { > builder = builder.proxy(ureq::Proxy::new(proxy_config.to_proxy_string()?)?); > -- > 2.30.2