From c668906047b572092b38ad2cbed77df2ce8b3c49 Mon Sep 17 00:00:00 2001 From: Louis Dureuil Date: Thu, 8 Feb 2024 09:43:39 +0100 Subject: [PATCH] Change error messages and fix tests --- index-scheduler/src/features.rs | 2 +- meilisearch/src/error.rs | 2 +- meilisearch/src/option.rs | 2 +- meilisearch/tests/logs/error.rs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/index-scheduler/src/features.rs b/index-scheduler/src/features.rs index 74b44bfa1..cd7d086b0 100644 --- a/index-scheduler/src/features.rs +++ b/index-scheduler/src/features.rs @@ -61,7 +61,7 @@ impl RoFeatures { Ok(()) } else { Err(FeatureNotEnabledError { - disabled_action: "getting logs through the `/logs` route", + disabled_action: "getting logs through the `/logs/stream` route", feature: "logs route", issue_link: "https://github.com/orgs/meilisearch/discussions/721", } diff --git a/meilisearch/src/error.rs b/meilisearch/src/error.rs index 6c5f76a72..a8351fd1f 100644 --- a/meilisearch/src/error.rs +++ b/meilisearch/src/error.rs @@ -12,7 +12,7 @@ pub enum MeilisearchHttpError { #[error("A Content-Type header is missing. Accepted values for the Content-Type header are: {}", .0.iter().map(|s| format!("`{}`", s)).collect::>().join(", "))] MissingContentType(Vec), - #[error("Log route is currently used by someone else.")] + #[error("The `/logs/stream` route is currently in use by someone else.")] AlreadyUsedLogRoute, #[error("The Content-Type `{0}` does not support the use of a csv delimiter. The csv delimiter can only be used with the Content-Type `text/csv`.")] CsvDelimiterWithWrongContentType(String), diff --git a/meilisearch/src/option.rs b/meilisearch/src/option.rs index 3a9b634b1..9586a3f6f 100644 --- a/meilisearch/src/option.rs +++ b/meilisearch/src/option.rs @@ -312,7 +312,7 @@ pub struct Opt { /// Experimental logs route feature. For more information, see: /// - /// Enables the log route on the `POST /logs` endpoint and the `DELETE /logs` to stop receiving logs. + /// Enables the log route on the `POST /logs/stream` endpoint and the `DELETE /logs/stream` to stop receiving logs. #[clap(long, env = MEILI_EXPERIMENTAL_ENABLE_LOGS_ROUTE)] #[serde(default)] pub experimental_enable_logs_route: bool, diff --git a/meilisearch/tests/logs/error.rs b/meilisearch/tests/logs/error.rs index 7cbc39b1f..078302632 100644 --- a/meilisearch/tests/logs/error.rs +++ b/meilisearch/tests/logs/error.rs @@ -162,7 +162,7 @@ async fn logs_stream_without_enabling_the_route() { snapshot!(code, @"400 Bad Request"); snapshot!(response, @r###" { - "message": "getting logs through the `/logs` route requires enabling the `logs route` experimental feature. See https://github.com/meilisearch/product/discussions/625", + "message": "getting logs through the `/logs/stream` route requires enabling the `logs route` experimental feature. See https://github.com/orgs/meilisearch/discussions/721", "code": "feature_not_enabled", "type": "invalid_request", "link": "https://docs.meilisearch.com/errors#feature_not_enabled" @@ -173,7 +173,7 @@ async fn logs_stream_without_enabling_the_route() { snapshot!(code, @"400 Bad Request"); snapshot!(response, @r###" { - "message": "getting logs through the `/logs` route requires enabling the `logs route` experimental feature. See https://github.com/meilisearch/product/discussions/625", + "message": "getting logs through the `/logs/stream` route requires enabling the `logs route` experimental feature. See https://github.com/orgs/meilisearch/discussions/721", "code": "feature_not_enabled", "type": "invalid_request", "link": "https://docs.meilisearch.com/errors#feature_not_enabled"