a bit of styling

This commit is contained in:
Tamo 2021-10-26 13:35:29 +02:00 committed by marin postma
parent 9a62ac0c94
commit 5508c6c154
No known key found for this signature in database
GPG Key ID: 6088B7721C3E39F9

View File

@ -137,10 +137,8 @@ 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 in the `data.ms` or in `/tmp/path-to-db-user-id`
let user_id = super::find_user_id(&opt.db_path); let user_id = super::find_user_id(&opt.db_path);
let first_time_run = user_id.is_none(); let first_time_run = user_id.is_none();
// 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());
super::write_user_id(&opt.db_path, &user_id); super::write_user_id(&opt.db_path, &user_id);
@ -168,10 +166,7 @@ mod segment {
if first_time_run { if first_time_run {
segment.publish("Launched".to_string(), json!({}), None); segment.publish("Launched".to_string(), json!({}), None);
} }
// start the runtime tick
segment.tick(meilisearch.clone()); segment.tick(meilisearch.clone());
segment segment
} }
@ -179,8 +174,6 @@ mod segment {
tokio::spawn(async move { tokio::spawn(async move {
loop { loop {
if let Ok(stats) = meilisearch.get_all_stats().await { if let Ok(stats) = meilisearch.get_all_stats().await {
let traits = Self::compute_traits(&self.opt, stats);
let user = self.user.clone();
let _ = self let _ = self
.batcher .batcher
.lock() .lock()
@ -191,8 +184,8 @@ mod segment {
"version": env!("CARGO_PKG_VERSION").to_string(), "version": env!("CARGO_PKG_VERSION").to_string(),
}, },
})), })),
user, user: user.clone(),
traits, traits: Self::compute_traits(&self.opt, stats),
..Default::default() ..Default::default()
}) })
.await; .await;
@ -207,7 +200,7 @@ mod segment {
let update_documents = let update_documents =
std::mem::take(&mut *self.update_documents_batcher.lock().await) std::mem::take(&mut *self.update_documents_batcher.lock().await)
.into_event(&self.user, "Documents Updated"); .into_event(&self.user, "Documents Updated");
// keep the lock on the batcher just for these three operations // keep the lock on the batcher just for these five operations
{ {
let mut batcher = self.batcher.lock().await; let mut batcher = self.batcher.lock().await;
if let Some(get_search) = get_search { if let Some(get_search) = get_search {