From 2c9776c3e8c69c9d4d6c2024a55852343b0dffd5 Mon Sep 17 00:00:00 2001 From: marinpostma Date: Thu, 14 May 2020 10:04:18 +0200 Subject: [PATCH 1/3] improve welcome message --- meilisearch-http/src/main.rs | 39 +++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/meilisearch-http/src/main.rs b/meilisearch-http/src/main.rs index 7e49796f2..3f64493b7 100644 --- a/meilisearch-http/src/main.rs +++ b/meilisearch-http/src/main.rs @@ -2,7 +2,6 @@ use std::{env, thread}; use actix_cors::Cors; use actix_web::{middleware, HttpServer}; -use log::info; use main_error::MainError; use meilisearch_http::data::Data; use meilisearch_http::helpers::NormalizeSlashes; @@ -94,37 +93,41 @@ pub fn print_launch_resume(opt: &Opt, data: &Data) { 888 888 "Y8888 888 888 888 "Y8888P" "Y8888 "Y888888 888 "Y8888P 888 888 "#; - info!("{}", ascii_name); + eprintln!("{}", ascii_name); - info!("Database path: {:?}", opt.db_path); - info!("Start server on: {:?}", opt.http_addr); - info!("Environment: {:?}", opt.env); - info!("Commit SHA: {:?}", env!("VERGEN_SHA").to_string()); - info!( - "Build date: {:?}", + eprintln!("Database path:\t\t{:?}", opt.db_path); + eprintln!("Server listening on:\t{:?}", opt.http_addr); + eprintln!("Environment:\t\t{:?}", opt.env); + eprintln!("Commit SHA:\t\t{:?}", env!("VERGEN_SHA").to_string()); + eprintln!( + "Build date:\t\t{:?}", env!("VERGEN_BUILD_TIMESTAMP").to_string() ); - info!( - "Package version: {:?}", + eprintln!( + "Package version:\t{:?}", env!("CARGO_PKG_VERSION").to_string() ); + eprintln!(); + if let Some(master_key) = &data.api_keys.master { - info!("Master Key: {:?}", master_key); + eprintln!("Master Key:\t{:?}", master_key); if let Some(private_key) = &data.api_keys.private { - info!("Private Key: {:?}", private_key); + eprintln!("Private Key:\t{:?}", private_key); } if let Some(public_key) = &data.api_keys.public { - info!("Public Key: {:?}", public_key); + eprintln!("Public Key:\t{:?}", public_key); } } else { - info!("No master key found; The server will have no securities.\ - If you need some protection in development mode, please export a key. export MEILI_MASTER_KEY=xxx"); + eprintln!("No master key found; The server will accept unidentified requests. \ + If you need some protection in development mode, please export a key: export MEILI_MASTER_KEY=xxx"); } - info!("If you need extra information; Please refer to the documentation: http://docs.meilisearch.com"); - info!("If you want to support us or help us; Please consult our Github repo: http://github.com/meilisearch/meilisearch"); - info!("If you want to contact us; Please chat with us on http://meilisearch.com or by email to bonjour@meilisearch.com"); + eprintln!(); + eprintln!("Documentation:\t\thttp://docs.meilisearch.com"); + eprintln!("Source code:\t\thttp://github.com/meilisearch/meilisearch"); + eprintln!("Contact:\t\thttps://docs.meilisearch.com/resources/contact.html or bonjour@meilisearch.com"); + eprintln!(); } From ef7b1cc82946bdc0169e96e66a175907e7de0cc6 Mon Sep 17 00:00:00 2001 From: mpostma Date: Thu, 14 May 2020 10:52:59 +0200 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c9f34f98..ffcaca57c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Bump sentry version to 0.18.1 (#690) - Disable sentry in debug (#681) + - Better terminal greeting (#680) - Fix highlight misalignment (#679) - Add support for facet count (#676) - Add support for faceted search (#631) From a1d20ea8c8e515960b9a67745e0fe2274b030892 Mon Sep 17 00:00:00 2001 From: mpostma Date: Tue, 19 May 2020 10:24:03 +0200 Subject: [PATCH 3/3] remove keys in welcome message --- meilisearch-http/src/main.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/meilisearch-http/src/main.rs b/meilisearch-http/src/main.rs index 3f64493b7..f6df9d2f3 100644 --- a/meilisearch-http/src/main.rs +++ b/meilisearch-http/src/main.rs @@ -110,16 +110,8 @@ pub fn print_launch_resume(opt: &Opt, data: &Data) { eprintln!(); - if let Some(master_key) = &data.api_keys.master { - eprintln!("Master Key:\t{:?}", master_key); - - if let Some(private_key) = &data.api_keys.private { - eprintln!("Private Key:\t{:?}", private_key); - } - - if let Some(public_key) = &data.api_keys.public { - eprintln!("Public Key:\t{:?}", public_key); - } + if data.api_keys.master.is_some() { + eprintln!("A Master Key has been set. Requests to MeiliSearch won't be authorized unless you provide an authentication key."); } else { eprintln!("No master key found; The server will accept unidentified requests. \ If you need some protection in development mode, please export a key: export MEILI_MASTER_KEY=xxx");