snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 10:37:41 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Errors when GETting metrics without the feature gate

Browse Source
This commit is contained in:
Louis Dureuil 2023-06-22 23:14:01 +02:00
parent 6196a53668
commit cca6e47ec1
No known key found for this signature in database
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meilisearch/src/lib.rs
View File

@ -111,7 +111,7 @@ pub fn create_app(
analytics.clone(), analytics.clone(),
) )
}) })
.configure(|cfg| routes::configure(cfg, opt.experimental_enable_metrics)) .configure(routes::configure)
.configure(|s| dashboard(s, enable_dashboard)); .configure(|s| dashboard(s, enable_dashboard));
let app = app.wrap(actix_web::middleware::Condition::new( let app = app.wrap(actix_web::middleware::Condition::new(

1
meilisearch/src/routes/metrics.rs
View File

@ -19,6 +19,7 @@ pub async fn get_metrics(
index_scheduler: GuardedData<ActionPolicy<{ actions::METRICS_GET }>, Data<IndexScheduler>>, index_scheduler: GuardedData<ActionPolicy<{ actions::METRICS_GET }>, Data<IndexScheduler>>,
auth_controller: Data<AuthController>, auth_controller: Data<AuthController>,
) -> Result<HttpResponse, ResponseError> { ) -> Result<HttpResponse, ResponseError> {
index_scheduler.features()?.check_metrics()?;
let auth_filters = index_scheduler.filters(); let auth_filters = index_scheduler.filters();
if !auth_filters.all_indexes_authorized() { if !auth_filters.all_indexes_authorized() {
let mut error = ResponseError::from(AuthenticationError::InvalidToken); let mut error = ResponseError::from(AuthenticationError::InvalidToken);

7
meilisearch/src/routes/mod.rs
View File

@ -27,7 +27,7 @@ mod multi_search;
mod swap_indexes; mod swap_indexes;
pub mod tasks; pub mod tasks;
pub fn configure(cfg: &mut web::ServiceConfig, enable_metrics: bool) { pub fn configure(cfg: &mut web::ServiceConfig) {
cfg.service(web::scope("/tasks").configure(tasks::configure)) cfg.service(web::scope("/tasks").configure(tasks::configure))
.service(web::resource("/health").route(web::get().to(get_health))) .service(web::resource("/health").route(web::get().to(get_health)))
.service(web::scope("/keys").configure(api_key::configure)) .service(web::scope("/keys").configure(api_key::configure))
@ -37,11 +37,8 @@ pub fn configure(cfg: &mut web::ServiceConfig, enable_metrics: bool) {
.service(web::scope("/indexes").configure(indexes::configure)) .service(web::scope("/indexes").configure(indexes::configure))
.service(web::scope("/multi-search").configure(multi_search::configure)) .service(web::scope("/multi-search").configure(multi_search::configure))
.service(web::scope("/swap-indexes").configure(swap_indexes::configure)) .service(web::scope("/swap-indexes").configure(swap_indexes::configure))
.service(web::scope("/metrics").configure(metrics::configure))
.service(web::scope("/experimental-features").configure(features::configure)); .service(web::scope("/experimental-features").configure(features::configure));
if enable_metrics {
cfg.service(web::scope("/metrics").configure(metrics::configure));
}
} }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]