From: Shannon Sterz <s.sterz@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox 1/2] acme-api: use inner mutability for ACME_ACME_CONFIG
Date: Tue, 3 Dec 2024 14:53:24 +0100 [thread overview]
Message-ID: <20241203135325.298743-1-s.sterz@proxmox.com> (raw)
in edition 2024 references to mutable static will be disallowed [1]. the
recommended way around this is to use types with inner mutability. so
use a `OnceLock` for `ACME_ACME_CONFIG` as the directoryfor ACME
configuration purposes shouldn't change throughout the run time of an
application.
[1]:
https://doc.rust-lang.org/nightly/edition-guide/rust-2024/static-mut-references.html
Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
---
proxmox-acme-api/src/init.rs | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/proxmox-acme-api/src/init.rs b/proxmox-acme-api/src/init.rs
index a5287a8e..5dcf048c 100644
--- a/proxmox-acme-api/src/init.rs
+++ b/proxmox-acme-api/src/init.rs
@@ -1,26 +1,28 @@
use std::path::{Path, PathBuf};
+use std::sync::OnceLock;
use anyhow::Error;
use proxmox_product_config::create_secret_dir;
+#[derive(Debug)]
struct AcmeApiConfig {
acme_config_dir: PathBuf,
acme_account_dir: PathBuf,
}
-static mut ACME_ACME_CONFIG: Option<AcmeApiConfig> = None;
+static ACME_ACME_CONFIG: OnceLock<AcmeApiConfig> = OnceLock::new();
/// Initialize the global product configuration.
pub fn init<P: AsRef<Path>>(acme_config_dir: P, create_subdirs: bool) -> Result<(), Error> {
let acme_config_dir = acme_config_dir.as_ref().to_owned();
- unsafe {
- ACME_ACME_CONFIG = Some(AcmeApiConfig {
+ ACME_ACME_CONFIG
+ .set(AcmeApiConfig {
acme_account_dir: acme_config_dir.join("accounts"),
acme_config_dir,
- });
- }
+ })
+ .expect("cannot set acme configuration twice");
if create_subdirs {
create_secret_dir(self::acme_config_dir(), false)?;
@@ -31,11 +33,9 @@ pub fn init<P: AsRef<Path>>(acme_config_dir: P, create_subdirs: bool) -> Result<
}
fn acme_api_config() -> &'static AcmeApiConfig {
- unsafe {
- ACME_ACME_CONFIG
- .as_ref()
- .expect("ProxmoxProductConfig is not initialized!")
- }
+ ACME_ACME_CONFIG
+ .get()
+ .expect("ProxmoxProductConfig is not initialized!")
}
fn acme_config_dir() -> &'static Path {
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next reply other threads:[~2024-12-03 13:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-03 13:53 Shannon Sterz [this message]
2024-12-03 13:53 ` [pbs-devel] [PATCH proxmox 2/2] product-config: use inner mutability for PRODUCT_CONFIG Shannon Sterz
2024-12-04 8:56 ` [pbs-devel] applied: [PATCH proxmox 1/2] acme-api: use inner mutability for ACME_ACME_CONFIG Dietmar Maurer
-- strict thread matches above, loose matches on Subject: below --
2024-12-03 13:48 [pbs-devel] " Shannon Sterz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241203135325.298743-1-s.sterz@proxmox.com \
--to=s.sterz@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox