searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-11 15:38:55 +01:00
Code Issues Releases Wiki Activity

update the way of getting and saving the user-id to the file system

Browse Source
This commit is contained in:
Irevoire 2021-10-13 16:36:15 +02:00 committed by marin postma
parent 30aeda7a1a
commit b33b1ef3dd
No known key found for this signature in database
GPG Key ID: 6088B7721C3E39F9
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meilisearch-http/src/analytics.rs
View File

@ -1,5 +1,6 @@
use serde_json::Value; use serde_json::Value;
use std::fmt::Display; use std::fmt::Display;
use std::fs::read_to_string;
use crate::Opt; use crate::Opt;
@ -14,6 +15,7 @@ mod segment {
use segment::{AutoBatcher, Batcher, HttpClient}; use segment::{AutoBatcher, Batcher, HttpClient};
use serde_json::{json, Value}; use serde_json::{json, Value};
use std::fmt::Display; use std::fmt::Display;
use std::fs;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use sysinfo::{DiskExt, System, SystemExt}; use sysinfo::{DiskExt, System, SystemExt};
use tokio::sync::Mutex; use tokio::sync::Mutex;
@ -73,12 +75,17 @@ mod segment {
} }
pub async fn new(opt: &Opt, meilisearch: &MeiliSearch) -> &'static Self { pub async fn new(opt: &Opt, meilisearch: &MeiliSearch) -> &'static Self {
// see if there is already a user-id // see if there is already a user-id in the `data.ms`
let user_id = std::fs::read_to_string(opt.db_path.join("user-id")); let user_id = fs::read_to_string(opt.db_path.join("user-id"))
.or_else(|_| fs::read_to_string("/tmp/meilisearch-user-id"));
let first_time_run = user_id.is_err(); let first_time_run = user_id.is_err();
// if not, generate a new user-id and save it to the fs // if not, generate a new user-id and save it to the fs
let user_id = user_id.unwrap_or_else(|_| Uuid::new_v4().to_string()); let user_id = user_id.unwrap_or_else(|_| Uuid::new_v4().to_string());
let _ = std::fs::write(opt.db_path.join("user-id"), user_id.as_bytes()); let _ = fs::write(opt.db_path.join("user-id"), user_id.as_bytes());
let _ = fs::write(
opt.db_path.join("/tmp/meilisearch-user-id"),
user_id.as_bytes(),
);
let client = HttpClient::default(); let client = HttpClient::default();
let user = User::UserId { let user = User::UserId {
@ -103,7 +110,7 @@ mod segment {
.await .await
.push(Identify { .push(Identify {
user: segment.user.clone(), user: segment.user.clone(),
// TODO: TAMO: what should we do when meilisearch is broken at start // If meilisearch is corrupted at the start we can panic
traits: Self::compute_traits( traits: Self::compute_traits(
&segment.opt, &segment.opt,
meilisearch.get_all_stats().await.unwrap(), meilisearch.get_all_stats().await.unwrap(),
@ -191,7 +198,8 @@ pub struct MockAnalytics {
impl MockAnalytics { impl MockAnalytics {
pub fn new(opt: &Opt) -> &'static Self { pub fn new(opt: &Opt) -> &'static Self {
let user = std::fs::read_to_string(opt.db_path.join("user-id")) let user = read_to_string(opt.db_path.join("user-id"))
.or_else(|_| read_to_string("/tmp/meilisearch-user-id"))
.unwrap_or_else(|_| "No user-id".to_string()); .unwrap_or_else(|_| "No user-id".to_string());
let analytics = Box::new(Self { user }); let analytics = Box::new(Self { user });
Box::leak(analytics) Box::leak(analytics)