proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-15 08:47:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid some clippy warnings

Browse Source
This commit is contained in:
Dietmar Maurer 2019-10-26 11:36:01 +02:00
parent d26fde6986
commit 40acfdf04c
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/server/rest.rs
View File

@ -1,4 +1,5 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::hash::BuildHasher;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::pin::Pin; use std::pin::Pin;
use std::sync::Arc; use std::sync::Arc;
@ -119,7 +120,7 @@ impl tower_service::Service<Request<Body>> for ApiService {
let path = req.uri().path().to_owned(); let path = req.uri().path().to_owned();
let method = req.method().clone(); let method = req.method().clone();
let peer = self.peer.clone(); let peer = self.peer;
Pin::from(handle_request(self.api_config.clone(), req)) Pin::from(handle_request(self.api_config.clone(), req))
.map(move |result| match result { .map(move |result| match result {
Ok(res) => { Ok(res) => {
@ -144,11 +145,11 @@ impl tower_service::Service<Request<Body>> for ApiService {
} }
} }
fn get_request_parameters_async( fn get_request_parameters_async<S: 'static + BuildHasher + Send>(
info: &'static ApiMethod, info: &'static ApiMethod,
parts: Parts, parts: Parts,
req_body: Body, req_body: Body,
uri_param: HashMap<String, String>, uri_param: HashMap<String, String, S>,
) -> Box<dyn Future<Output = Result<Value, failure::Error>> + Send> ) -> Box<dyn Future<Output = Result<Value, failure::Error>> + Send>
{ {
let mut is_json = false; let mut is_json = false;
@ -162,7 +163,7 @@ fn get_request_parameters_async(
is_json = true; is_json = true;
} }
_ => { _ => {
return Box::new(future::err(http_err!(BAD_REQUEST, format!("unsupported content type")))); return Box::new(future::err(http_err!(BAD_REQUEST, "unsupported content type".to_string())));
} }
} }
} }
@ -174,7 +175,7 @@ fn get_request_parameters_async(
acc.extend_from_slice(&*chunk); acc.extend_from_slice(&*chunk);
Ok(acc) Ok(acc)
} else { } else {
Err(http_err!(BAD_REQUEST, format!("Request body too large"))) Err(http_err!(BAD_REQUEST, "Request body too large".to_string()))
} }
}) })
.and_then(move |body| async move { .and_then(move |body| async move {
@ -195,11 +196,10 @@ fn get_request_parameters_async(
let mut param_list: Vec<(String, String)> = vec![]; let mut param_list: Vec<(String, String)> = vec![];
if utf8.len() > 0 { if !utf8.is_empty() {
for (k, v) in form_urlencoded::parse(utf8.as_bytes()).into_owned() { for (k, v) in form_urlencoded::parse(utf8.as_bytes()).into_owned() {
param_list.push((k, v)); param_list.push((k, v));
} }
} }
if let Some(query_str) = parts.uri.query() { if let Some(query_str) = parts.uri.query() {
@ -260,13 +260,13 @@ fn proxy_protected_request(
}) })
} }
pub fn handle_sync_api_request<Env: RpcEnvironment>( pub fn handle_sync_api_request<Env: RpcEnvironment, S: 'static + BuildHasher + Send>(
mut rpcenv: Env, mut rpcenv: Env,
info: &'static ApiMethod, info: &'static ApiMethod,
formatter: &'static OutputFormatter, formatter: &'static OutputFormatter,
parts: Parts, parts: Parts,
req_body: Body, req_body: Body,
uri_param: HashMap<String, String>, uri_param: HashMap<String, String, S>,
) -> BoxFut ) -> BoxFut
{ {
let params = get_request_parameters_async(info, parts, req_body, uri_param); let params = get_request_parameters_async(info, parts, req_body, uri_param);
@ -339,7 +339,7 @@ pub fn handle_async_api_request<Env: RpcEnvironment>(
match (info.handler)(parts, req_body, params, info, Box::new(rpcenv)) { match (info.handler)(parts, req_body, params, info, Box::new(rpcenv)) {
Ok(future) => future, Ok(future) => future,
Err(err) => { Err(err) => {
let resp = (formatter.format_error)(Error::from(err)); let resp = (formatter.format_error)(err);
Box::new(future::ok(resp)) Box::new(future::ok(resp))
} }
} }
@ -348,9 +348,9 @@ pub fn handle_async_api_request<Env: RpcEnvironment>(
fn get_index(username: Option<String>, token: Option<String>) -> Response<Body> { fn get_index(username: Option<String>, token: Option<String>) -> Response<Body> {
let nodename = proxmox::tools::nodename(); let nodename = proxmox::tools::nodename();
let username = username.unwrap_or(String::from("")); let username = username.unwrap_or_else(|| String::from(""));
let token = token.unwrap_or(String::from("")); let token = token.unwrap_or_else(|| String::from(""));
let setup = json!({ let setup = json!({
"Setup": { "auth_cookie_name": "PBSAuthCookie" }, "Setup": { "auth_cookie_name": "PBSAuthCookie" },
@ -614,7 +614,7 @@ pub fn handle_request(api: Arc<ApiConfig>, req: Request<Body>) -> BoxFut {
// not Auth required for accessing files! // not Auth required for accessing files!
if method != hyper::Method::GET { if method != hyper::Method::GET {
return Box::new(future::err(http_err!(BAD_REQUEST, format!("Unsupported method")))); return Box::new(future::err(http_err!(BAD_REQUEST, "Unsupported method".to_string())));
} }
if comp_len == 0 { if comp_len == 0 {

7
src/server/state.rs
View File

@ -22,7 +22,6 @@ pub struct ServerState {
pub reload_request: bool, pub reload_request: bool,
} }
lazy_static! { lazy_static! {
static ref SERVER_STATE: Mutex<ServerState> = Mutex::new(ServerState { static ref SERVER_STATE: Mutex<ServerState> = Mutex::new(ServerState {
mode: ServerMode::Normal, mode: ServerMode::Normal,
@ -69,11 +68,7 @@ pub fn server_state_init() -> Result<(), Error> {
pub fn is_reload_request() -> bool { pub fn is_reload_request() -> bool {
let data = SERVER_STATE.lock().unwrap(); let data = SERVER_STATE.lock().unwrap();
if data.mode == ServerMode::Shutdown && data.reload_request { data.mode == ServerMode::Shutdown && data.reload_request
true
} else {
false
}
} }
pub fn server_shutdown() { pub fn server_shutdown() {

3
src/tools/daemon.rs
View File

@ -28,6 +28,7 @@ pub trait Reloadable: Sized {
/// Manages things to be stored and reloaded upon reexec. /// Manages things to be stored and reloaded upon reexec.
/// Anything which should be restorable should be instantiated via this struct's `restore` method, /// Anything which should be restorable should be instantiated via this struct's `restore` method,
#[derive(Default)]
pub struct Reloader { pub struct Reloader {
pre_exec: Vec<PreExecEntry>, pre_exec: Vec<PreExecEntry>,
} }
@ -241,7 +242,7 @@ where
} }
if let Err(e) = reloader.take().unwrap().fork_restart() { if let Err(e) = reloader.take().unwrap().fork_restart() {
log::error!("error during reload: {}", e); log::error!("error during reload: {}", e);
let _ = systemd_notify(SystemdNotify::Status(format!("error during reload"))); let _ = systemd_notify(SystemdNotify::Status("error during reload".to_string()));
} }
} else { } else {
log::info!("daemon shutting down..."); log::info!("daemon shutting down...");