filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update all modules to use registry - part 3

Browse Source
This commit is contained in:
mdecimus
2026-02-11 21:30:17 +00:00
parent c4064082ea
commit f7c2fe10c1
86 changed files with 1010 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/http/src/autoconfig/mod.rs
View File

@@ -4,7 +4,7 @@
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
*/
use common::{Server, manager::webadmin::Resource};
use common::{Server, manager::application::Resource};
use http_proto::*;
use quick_xml::Reader;
use quick_xml::events::Event;

65
crates/http/src/management/telemetry.rs
View File

@@ -154,16 +154,12 @@ impl TelemetryApi for Server {
tracing_query.push(SearchFilter::End);
let store = &self
.core
.enterprise
.as_ref()
.and_then(|e| e.trace_store.as_ref())
.ok_or_else(|| {
trc::ManageEvent::NotSupported
.ctx(trc::Key::Details, "No tracing store has been configured")
})?
.store;
let store = self.tracing_store();
if !store.is_active() {
return Err(trc::ManageEvent::NotSupported
.ctx(trc::Key::Details, "No tracing store has been configured"));
}
let span_ids = self
.search_store()
@@ -354,16 +350,11 @@ impl TelemetryApi for Server {
// Validate the access token
access_token.enforce_permission(Permission::TracingGet)?;
let store = &self
.core
.enterprise
.as_ref()
.and_then(|e| e.trace_store.as_ref())
.ok_or_else(|| {
trc::ManageEvent::NotSupported
.ctx(trc::Key::Details, "No tracing store has been configured")
})?
.store;
let store = self.tracing_store();
if !store.is_active() {
return Err(trc::ManageEvent::NotSupported
.ctx(trc::Key::Details, "No tracing store has been configured"));
}
let mut events = Vec::new();
for span_id in id
@@ -415,6 +406,7 @@ impl TelemetryApi for Server {
.into_http_response())
}
("metrics", None, &Method::GET) => {
let todo = "move to registry";
// Validate the access token
access_token.enforce_permission(Permission::MetricsList)?;
@@ -426,25 +418,20 @@ impl TelemetryApi for Server {
.parse::<Timestamp>("after")
.map(|t| t.into_inner())
.unwrap_or(0);
let results = self
.core
.enterprise
.as_ref()
.and_then(|e| e.metrics_store.as_ref())
.ok_or_else(|| {
trc::ManageEvent::Error
.ctx(trc::Key::Details, "No metrics store has been defined")
.ctx(
trc::Key::Reason,
concat!(
"You need to configure a metrics ",
"store in order to use this feature."
),
)
})?
.store
.query_metrics(after, before)
.await?;
if !self.metrics_store().is_active() {
return Err(trc::ManageEvent::Error
.ctx(trc::Key::Details, "No metrics store has been defined")
.ctx(
trc::Key::Reason,
concat!(
"You need to configure a metrics ",
"store in order to use this feature."
),
));
}
let results = self.metrics_store().query_metrics(after, before).await?;
let mut metrics = Vec::with_capacity(results.len());
for metric in results {

6
crates/http/src/request.rs
View File

@@ -21,7 +21,7 @@ use common::{
BuildServer, Inner, KV_ACME, Server,
auth::{AccessToken, oauth::GrantType},
ipc::PushEvent,
manager::webadmin::Resource,
manager::application::Resource,
network::{SessionData, SessionManager, SessionStream},
};
use dav::{DavMethod, request::DavRequestHandler};
@@ -565,7 +565,7 @@ impl ParseHttp for Server {
}
}
let resource = self.inner.data.webadmin.get("logo.svg").await?;
let resource = self.inner.data.applications.get("logo.svg").await?;
if !resource.is_empty() {
return Ok(resource.into_http_response());
@@ -599,7 +599,7 @@ impl ParseHttp for Server {
let resource = self
.inner
.data
.webadmin
.applications
.get(path.strip_prefix('/').unwrap_or(path))
.await?;