proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-04-30 04:14:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dns-api: remove lazy-static dependency

Browse Source 
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
This commit is contained in:
Maximiliano Sandoval 2024-08-14 09:19:51 +02:00 committed by Wolfgang Bumiller
parent 9f9f736cfc
commit 9693ceca7a
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxmox-dns-api/Cargo.toml
View File

@ -7,11 +7,11 @@ license.workspace = true
repository.workspace = true repository.workspace = true
exclude.workspace = true exclude.workspace = true
description = "DNS Management API implementation" description = "DNS Management API implementation"
rust-version.workspace = true
[dependencies] [dependencies]
anyhow.workspace = true anyhow.workspace = true
const_format.workspace = true const_format.workspace = true
lazy_static.workspace = true
regex.workspace = true regex.workspace = true
serde = { workspace = true, features = ["derive"] } serde = { workspace = true, features = ["derive"] }

17
proxmox-dns-api/src/resolv_conf.rs
View File

@ -1,9 +1,7 @@
use std::sync::Arc; use std::sync::{Arc, LazyLock, Mutex};
use std::sync::Mutex;
use anyhow::Error; use anyhow::Error;
use const_format::concatcp; use const_format::concatcp;
use lazy_static::lazy_static;
use proxmox_config_digest::ConfigDigest; use proxmox_config_digest::ConfigDigest;
use regex::Regex; use regex::Regex;
@ -34,11 +32,10 @@ pub fn read_etc_resolv_conf(
let data = String::from_utf8(raw)?; let data = String::from_utf8(raw)?;
lazy_static! { static DOMAIN_REGEX: LazyLock<Regex> =
static ref DOMAIN_REGEX: Regex = Regex::new(r"^\s*(?:search|domain)\s+(\S+)\s*").unwrap(); LazyLock::new(|| Regex::new(r"^\s*(?:search|domain)\s+(\S+)\s*").unwrap());
static ref SERVER_REGEX: Regex = static SERVER_REGEX: LazyLock<Regex> =
Regex::new(concatcp!(r"^\s*nameserver\s+(", IPRE_STR, r")\s*")).unwrap(); LazyLock::new(|| Regex::new(concatcp!(r"^\s*nameserver\s+(", IPRE_STR, r")\s*")).unwrap());
}
let mut options = String::new(); let mut options = String::new();
@ -78,9 +75,7 @@ pub fn update_dns(
delete: Option<Vec<DeletableResolvConfProperty>>, delete: Option<Vec<DeletableResolvConfProperty>>,
digest: Option<ConfigDigest>, digest: Option<ConfigDigest>,
) -> Result<(), Error> { ) -> Result<(), Error> {
lazy_static! { static MUTEX: LazyLock<Arc<Mutex<()>>> = LazyLock::new(|| Arc::new(Mutex::new(())));
static ref MUTEX: Arc<Mutex<()>> = Arc::new(Mutex::new(()));
}
let _guard = MUTEX.lock(); let _guard = MUTEX.lock();