nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 20:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make tracing-actix-web optional too

Browse Source
This commit is contained in:
Lennart
2025-06-02 22:00:36 +02:00
parent 9836a696ad
commit 13128a5caa
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/dav/Cargo.toml
View File

@@ -7,7 +7,7 @@ repository.workspace = true
publish = false publish = false
[features] [features]
actix = ["dep:actix-web"] actix = ["dep:actix-web", "dep:tracing-actix-web"]
[dependencies] [dependencies]
rustical_xml.workspace = true rustical_xml.workspace = true
@@ -20,8 +20,8 @@ itertools.workspace = true
log.workspace = true log.workspace = true
derive_more.workspace = true derive_more.workspace = true
tracing.workspace = true tracing.workspace = true
tracing-actix-web.workspace = true
tokio.workspace = true tokio.workspace = true
http.workspace = true http.workspace = true
actix-web = { workspace = true, optional = true } actix-web = { workspace = true, optional = true }
tracing-actix-web = { workspace = true, optional = true }
headers.workspace = true headers.workspace = true

3
crates/dav/src/resource/methods/delete.rs
View File

@@ -6,7 +6,6 @@ use headers::Header;
use headers::{HeaderValue, IfMatch, IfNoneMatch}; use headers::{HeaderValue, IfMatch, IfNoneMatch};
use itertools::Itertools; use itertools::Itertools;
use tracing::instrument; use tracing::instrument;
use tracing_actix_web::RootSpan;
#[cfg(feature = "actix")] #[cfg(feature = "actix")]
#[instrument(parent = root_span.id(), skip(path, req, root_span, resource_service))] #[instrument(parent = root_span.id(), skip(path, req, root_span, resource_service))]
@@ -15,7 +14,7 @@ pub async fn actix_route_delete<R: ResourceService>(
req: actix_web::HttpRequest, req: actix_web::HttpRequest,
principal: R::Principal, principal: R::Principal,
resource_service: actix_web::web::Data<R>, resource_service: actix_web::web::Data<R>,
root_span: RootSpan, root_span: tracing_actix_web::RootSpan,
) -> Result<actix_web::HttpResponse, R::Error> { ) -> Result<actix_web::HttpResponse, R::Error> {
let no_trash = req let no_trash = req
.headers() .headers()

3
crates/dav/src/resource/methods/propfind.rs
View File

@@ -10,7 +10,6 @@ use crate::xml::PropfindElement;
use crate::xml::PropfindType; use crate::xml::PropfindType;
use rustical_xml::XmlDocument; use rustical_xml::XmlDocument;
use tracing::instrument; use tracing::instrument;
use tracing_actix_web::RootSpan;
#[cfg(feature = "actix")] #[cfg(feature = "actix")]
#[instrument(parent = root_span.id(), skip(path, req, root_span, resource_service, puri))] #[instrument(parent = root_span.id(), skip(path, req, root_span, resource_service, puri))]
@@ -21,7 +20,7 @@ pub(crate) async fn actix_route_propfind<R: ResourceService>(
req: ::actix_web::HttpRequest, req: ::actix_web::HttpRequest,
user: R::Principal, user: R::Principal,
depth: Depth, depth: Depth,
root_span: RootSpan, root_span: tracing_actix_web::RootSpan,
resource_service: ::actix_web::web::Data<R>, resource_service: ::actix_web::web::Data<R>,
puri: ::actix_web::web::Data<R::PrincipalUri>, puri: ::actix_web::web::Data<R::PrincipalUri>,
) -> Result< ) -> Result<

3
crates/dav/src/resource/methods/proppatch.rs
View File

@@ -14,7 +14,6 @@ use rustical_xml::XmlDocument;
use rustical_xml::XmlRootTag; use rustical_xml::XmlRootTag;
use std::str::FromStr; use std::str::FromStr;
use tracing::instrument; use tracing::instrument;
use tracing_actix_web::RootSpan;
#[derive(XmlDeserialize, Clone, Debug)] #[derive(XmlDeserialize, Clone, Debug)]
#[xml(untagged)] #[xml(untagged)]
@@ -68,7 +67,7 @@ pub(crate) async fn actix_route_proppatch<R: ResourceService>(
body: String, body: String,
req: actix_web::HttpRequest, req: actix_web::HttpRequest,
principal: R::Principal, principal: R::Principal,
root_span: RootSpan, root_span: tracing_actix_web::RootSpan,
resource_service: actix_web::web::Data<R>, resource_service: actix_web::web::Data<R>,
) -> Result<MultistatusElement<String, String>, R::Error> { ) -> Result<MultistatusElement<String, String>, R::Error> {
route_proppatch( route_proppatch(