From 029772e11f1a667834f74aaac2ffc371a6cab309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Eriksson?= Date: Wed, 1 Jul 2020 13:45:00 +0200 Subject: [PATCH 1/2] Fix typo in option.rs --- meilisearch-http/src/option.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meilisearch-http/src/option.rs b/meilisearch-http/src/option.rs index f8d9170b1..b1e8cea7b 100644 --- a/meilisearch-http/src/option.rs +++ b/meilisearch-http/src/option.rs @@ -26,7 +26,7 @@ pub struct Opt { #[structopt(long, env = "MEILI_MASTER_KEY")] pub master_key: Option, - /// This environment variable must be set to `production` if your are running in production. + /// This environment variable must be set to `production` if you are running in production. /// If the server is running in development mode more logs will be displayed, /// and the master key can be avoided which implies that there is no security on the updates routes. /// This is useful to debug when integrating the engine with another service. From ab16e2eff103b32590309e54b87e8695e255dc78 Mon Sep 17 00:00:00 2001 From: marin Date: Thu, 2 Jul 2020 14:04:15 +0200 Subject: [PATCH 2/2] fix merge error --- meilisearch-http/src/option.rs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meilisearch-http/src/option.rs b/meilisearch-http/src/option.rs index b1e8cea7b..0c212066e 100644 --- a/meilisearch-http/src/option.rs +++ b/meilisearch-http/src/option.rs @@ -26,6 +26,17 @@ pub struct Opt { #[structopt(long, env = "MEILI_MASTER_KEY")] pub master_key: Option, + /// The Sentry DSN to use for error reporting. This defaults to the MeiliSearch Sentry project. + /// You can disable sentry all together using the `--no-sentry` flag or `MEILI_NO_SENTRY` environment variable. + #[cfg(all(not(debug_assertions), feature = "sentry"))] + #[structopt(long, env = "SENTRY_DSN", default_value = "https://5ddfa22b95f241198be2271aaf028653@sentry.io/3060337")] + pub sentry_dsn: String, + + /// Disable Sentry error reporting. + #[cfg(all(not(debug_assertions), feature = "sentry"))] + #[structopt(long, env = "MEILI_NO_SENTRY")] + pub no_sentry: bool, + /// This environment variable must be set to `production` if you are running in production. /// If the server is running in development mode more logs will be displayed, /// and the master key can be avoided which implies that there is no security on the updates routes.