From f69adc81a613d0abcb396619c0a2a76f8a7a4ebe Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Sat, 3 Aug 2019 17:06:23 +0200 Subject: [PATCH] use new proxmox::tools::nodename --- src/api2/types.rs | 2 +- src/bin/proxmox-backup-client.rs | 4 ++-- src/server/rest.rs | 2 +- src/server/upid.rs | 4 +--- src/tools.rs | 18 ------------------ 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/api2/types.rs b/src/api2/types.rs index 89a97202..a0e40eed 100644 --- a/src/api2/types.rs +++ b/src/api2/types.rs @@ -38,7 +38,7 @@ lazy_static!{ StringSchema::new("Node name (or 'localhost')") .format( Arc::new(ApiStringFormat::VerifyFn(|node| { - if node == "localhost" || node == crate::tools::nodename() { + if node == "localhost" || node == proxmox::tools::nodename() { Ok(()) } else { bail!("no such node '{}'", node); diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index 077188a1..42e30198 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -469,7 +469,7 @@ fn create_backup( let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p)); - let backup_id = param["backup-id"].as_str().unwrap_or(&tools::nodename()); + let backup_id = param["backup-id"].as_str().unwrap_or(&proxmox::tools::nodename()); let backup_type = param["backup-type"].as_str().unwrap_or("host"); @@ -553,7 +553,7 @@ fn create_backup( println!("Starting backup: {}/{}/{}", backup_type, backup_id, BackupDir::backup_time_to_string(backup_time)); - println!("Client name: {}", tools::nodename()); + println!("Client name: {}", proxmox::tools::nodename()); let start_time = Local::now(); diff --git a/src/server/rest.rs b/src/server/rest.rs index 8ff4b685..d8ac7136 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -343,7 +343,7 @@ pub fn handle_async_api_request( fn get_index(username: Option, token: Option) -> Response { - let nodename = tools::nodename(); + let nodename = proxmox::tools::nodename(); let username = username.unwrap_or(String::from("")); let token = token.unwrap_or(String::from("")); diff --git a/src/server/upid.rs b/src/server/upid.rs index 969ea371..af8bd282 100644 --- a/src/server/upid.rs +++ b/src/server/upid.rs @@ -5,8 +5,6 @@ use chrono::Local; use std::sync::atomic::{AtomicUsize, Ordering}; -use crate::tools; - /// Unique Process/Task Identifier /// /// We use this to uniquely identify worker task. UPIDs have a short @@ -68,7 +66,7 @@ impl UPID { worker_type: worker_type.to_owned(), worker_id, username: username.to_owned(), - node: tools::nodename().to_owned(), + node: proxmox::tools::nodename().to_owned(), }) } diff --git a/src/tools.rs b/src/tools.rs index 533417ac..243a256e 100644 --- a/src/tools.rs +++ b/src/tools.rs @@ -2,7 +2,6 @@ //! //! This is a collection of small and useful tools. use failure::*; -use lazy_static::lazy_static; use std::fs::{File, OpenOptions}; use std::path::Path; @@ -215,23 +214,6 @@ pub fn getpwnam_ugid(username: &str) -> Result<(libc::uid_t,libc::gid_t), Error> Ok((info.pw_uid, info.pw_gid)) } -// Returns the hosts node name (UTS node name) -pub fn nodename() -> &'static str { - - lazy_static!{ - static ref NODENAME: String = { - - nix::sys::utsname::uname() - .nodename() - .split('.') - .next() - .unwrap() - .to_owned() - }; - } - - &NODENAME -} pub fn json_object_to_query(data: Value) -> Result {