Skip to content

Fix: Add proper error handling for db_path in server API #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
echobt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Add proper error handling for db_path in server API #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions src/server/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,20 @@ async fn health() -> impl IntoResponse {
}

async fn status(State(state): State<SharedState>) -> impl IntoResponse {
let db = match Database::new(&state.config.db_path().unwrap_or_default()) {
let db_path = match state.config.db_path() {
Ok(path) => path,
Err(e) => {
return (
StatusCode::INTERNAL_SERVER_ERROR,
Json(serde_json::json!({
"error": format!("Failed to resolve database path: {}", e)
})),
)
.into_response();
}
};

let db = match Database::new(&db_path) {
Ok(db) => db,
Err(e) => {
return (
Expand Down Expand Up @@ -228,7 +241,20 @@ async fn search(
};

// Search in database
let db = match Database::new(&state.config.db_path().unwrap_or_default()) {
let db_path = match state.config.db_path() {
Ok(path) => path,
Err(e) => {
return (
StatusCode::INTERNAL_SERVER_ERROR,
Json(serde_json::json!({
"error": format!("Failed to resolve database path: {}", e)
})),
)
.into_response();
}
};

let db = match Database::new(&db_path) {
Ok(db) => db,
Err(e) => {
return (
Expand Down
Loading