proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-05-03 08:42:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move src/server/h2service.rs into proxmox-rest-server crate

Browse Source
This commit is contained in:
Dietmar Maurer 2021-09-23 12:38:09 +02:00
parent e8c124fe1b
commit 85ec987a48
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/h2service.rs → proxmox-rest-server/src/h2service.rs
View File

@ -11,8 +11,8 @@ use hyper::{Body, Request, Response, StatusCode};
use proxmox::api::{ApiResponseFuture, HttpError, Router, RpcEnvironment}; use proxmox::api::{ApiResponseFuture, HttpError, Router, RpcEnvironment};
use proxmox::http_err; use proxmox::http_err;
use proxmox_rest_server::{normalize_uri_path, WorkerTask}; use crate::{normalize_uri_path, WorkerTask};
use proxmox_rest_server::formatter::*; use crate::formatter::*;
/// Hyper Service implementation to handle stateful H2 connections. /// Hyper Service implementation to handle stateful H2 connections.
/// ///
@ -59,7 +59,7 @@ impl <E: RpcEnvironment + Clone> H2Service<E> {
future::ok((formatter.format_error)(err)).boxed() future::ok((formatter.format_error)(err)).boxed()
} }
Some(api_method) => { Some(api_method) => {
proxmox_rest_server::handle_api_request( crate::rest::handle_api_request(
self.rpcenv.clone(), api_method, formatter, parts, body, uri_param).boxed() self.rpcenv.clone(), api_method, formatter, parts, body, uri_param).boxed()
} }
} }

5
proxmox-rest-server/src/lib.rs
View File

@ -30,11 +30,14 @@ mod api_config;
pub use api_config::ApiConfig; pub use api_config::ApiConfig;
mod rest; mod rest;
pub use rest::{RestServer, handle_api_request}; pub use rest::RestServer;
mod worker_task; mod worker_task;
pub use worker_task::*; pub use worker_task::*;
mod h2service;
pub use h2service::*;
pub enum AuthError { pub enum AuthError {
Generic(Error), Generic(Error),
NoData, NoData,

2
proxmox-rest-server/src/rest.rs
View File

@ -388,7 +388,7 @@ async fn proxy_protected_request(
Ok(resp) Ok(resp)
} }
pub async fn handle_api_request<Env: RpcEnvironment, S: 'static + BuildHasher + Send>( pub(crate) async fn handle_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,