fix(server): safely drop detached tokio join handles and refactor timestamp boilerplate
This commit is contained in:
1 parent
13c7eca4c2
commit
478655698e
15 files changed
+457
-312
No files matched your search
+6
-4
@@ -42,12 +42,12 @@ impl MemoryState {
|
||||
.duration_since(std::time::UNIX_EPOCH)
|
||||
.unwrap_or_default()
|
||||
.as_millis() as u64;
|
||||
|
||||
|
||||
let item = serde_json::json!({
|
||||
"time": time,
|
||||
"message": message
|
||||
});
|
||||
|
||||
|
||||
self.recent_activities.modify(|activities| {
|
||||
activities.push_back(item.clone());
|
||||
if activities.len() > 100 {
|
||||
@@ -79,7 +79,7 @@ impl MemoryState {
|
||||
if let Ok(new_idx) = MemoryIndex::new(&self.base_dir) {
|
||||
let state = Arc::clone(self);
|
||||
let idx = new_idx.clone();
|
||||
|
||||
|
||||
tokio::task::spawn_blocking(move || {
|
||||
state.graph.read_with(|g| {
|
||||
for e in g.entities.values() {
|
||||
@@ -101,7 +101,9 @@ impl MemoryState {
|
||||
idx.add_adr_sync(a);
|
||||
}
|
||||
});
|
||||
}).await.unwrap_or_else(|e| {
|
||||
})
|
||||
.await
|
||||
.unwrap_or_else(|e| {
|
||||
tracing::error!("Failed to join tantivy index rebuild thread: {}", e);
|
||||
});
|
||||
|
||||
|
||||
Reference in new issue
Block a user