searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-04 20:37:15 +02:00
Code Issues Releases Wiki Activity

pass anaytics into Arc instead of static ref

Browse source
This commit is contained in:
marin postma 2021-10-29 15:58:06 +02:00
parent 66d87761b7
commit d65f055030
No known key found for this signature in database
GPG key ID: 6088B7721C3E39F9
5 changed files with 57 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

22
meilisearch-http/src/main.rs
View file

@ -1,4 +1,5 @@
use std::env;
use std::sync::Arc;
use actix_web::HttpServer;
use meilisearch_http::analytics;
@ -46,15 +47,15 @@ async fn main() -> anyhow::Result<()> {
let meilisearch = setup_meilisearch(&opt)?;
#[cfg(all(not(debug_assertions), feature = "analytics"))]
let analytics = if !opt.no_analytics {
analytics::SegmentAnalytics::new(&opt, &meilisearch).await as &'static dyn Analytics
let (analytics, user) = if !opt.no_analytics {
analytics::SegmentAnalytics::new(&opt, &meilisearch).await
} else {
analytics::MockAnalytics::new(&opt) as &'static dyn Analytics
analytics::MockAnalytics::new(&opt)
};
#[cfg(any(debug_assertions, not(feature = "analytics")))]
let analytics = analytics::MockAnalytics::new(&opt);
let (analytics, user) = analytics::MockAnalytics::new(&opt);
print_launch_resume(&opt, analytics);
print_launch_resume(&opt, &user);
run_http(meilisearch, opt, analytics).await?;
@ -64,12 +65,12 @@ async fn main() -> anyhow::Result<()> {
async fn run_http(
data: MeiliSearch,
opt: Opt,
analytics: &'static dyn Analytics,
analytics: Arc<dyn Analytics>,
) -> anyhow::Result<()> {
let _enable_dashboard = &opt.env == "development";
let opt_clone = opt.clone();
let http_server =
HttpServer::new(move || create_app!(data, _enable_dashboard, opt_clone, analytics))
HttpServer::new(move || create_app!(data, _enable_dashboard, opt_clone, analytics.clone()))
// Disable signals allows the server to terminate immediately when a user enter CTRL-C
.disable_signals();
@ -84,7 +85,7 @@ async fn run_http(
Ok(())
}
pub fn print_launch_resume(opt: &Opt, analytics: &'static dyn Analytics) {
pub fn print_launch_resume(opt: &Opt, user: &str) {
let commit_sha = option_env!("VERGEN_GIT_SHA").unwrap_or("unknown");
let commit_date = option_env!("VERGEN_GIT_COMMIT_TIMESTAMP").unwrap_or("unknown");
@ -127,9 +128,8 @@ Anonymous telemetry:\t\"Enabled\""
}
}
let analytics = analytics.to_string();
if !analytics.is_empty() {
eprintln!("Instance UID:\t\t\"{}\"", analytics);
if !user.is_empty() {
eprintln!("Instance UID:\t\t\"{}\"", user);
}
eprintln!();