searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-02-11 13:04:06 +01:00
Code Issues Releases Wiki Activity

Improve error message when update file has been processed

Browse Source
This commit is contained in:
Kerollmops 2025-02-10 14:33:01 +01:00
parent df40533741
commit c71eea8023
No known key found for this signature in database
GPG Key ID: F250A4C4E3AE5F5F
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/meilisearch/src/routes/tasks.rs
View File

@ -1,3 +1,5 @@
use std::io::ErrorKind;
use actix_web::web::Data; use actix_web::web::Data;
use actix_web::{web, HttpRequest, HttpResponse}; use actix_web::{web, HttpRequest, HttpResponse};
use deserr::actix_web::AwebQueryParameter; use deserr::actix_web::AwebQueryParameter;
@ -710,10 +712,15 @@ async fn get_task_update_file(
if let Some(task) = tasks.first() { if let Some(task) = tasks.first() {
match task.content_uuid() { match task.content_uuid() {
Some(uuid) => { Some(uuid) => {
let mut tfile = match index_scheduler.queue.update_file(uuid) {
Ok(file) => tokio::fs::File::from_std(file),
Err(file_store::Error::IoError(e)) if e.kind() == ErrorKind::NotFound => {
return Err(index_scheduler::Error::TaskFileNotFound(task_uid).into())
}
Err(e) => return Err(e.into()),
};
// Yes, that's awful to put everything in memory when we could have streamed it from // Yes, that's awful to put everything in memory when we could have streamed it from
// disk but it's really (really) complex to do with the current state of async Rust. // disk but it's really (really) complex to do with the current state of async Rust.
let file = index_scheduler.queue.update_file(uuid)?;
let mut tfile = tokio::fs::File::from_std(file);
let mut content = String::new(); let mut content = String::new();
tfile.read_to_string(&mut content).await?; tfile.read_to_string(&mut content).await?;
Ok(HttpResponse::Ok().content_type("application/x-ndjson").body(content)) Ok(HttpResponse::Ok().content_type("application/x-ndjson").body(content))