From 8881d6c904636d6ecc857cbcee9e42fc475505e0 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Tue, 9 Jul 2024 23:13:23 -0600 Subject: [PATCH] api/ja4db: log update errors Currently the ja4db website is failing, but its hard to know that from a simple "internal server" error returned to the client. --- src/server/api/admin.rs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/server/api/admin.rs b/src/server/api/admin.rs index 221465ab..3d6134e2 100644 --- a/src/server/api/admin.rs +++ b/src/server/api/admin.rs @@ -3,24 +3,33 @@ use std::sync::Arc; +use anyhow::Result; use axum::{Extension, Json}; -use tracing::info; +use tracing::error; use crate::server::{main::SessionExtractor, ServerContext}; use super::ApiError; pub(super) async fn update_ja4db( - context: Extension>, + Extension(context): Extension>, _session: SessionExtractor, ) -> Result, ApiError> { + match do_update(context).await { + Ok(response) => Ok(response), + Err(err) => { + error!("Request to update JA4db failed: {err}"); + Err(err.into()) + } + } +} + +async fn do_update(context: Arc) -> Result> { let mut conn = context.config_repo.pool.begin().await?; - info!("Updating JA4db"); let n = crate::commands::ja4db::updatedb(&mut conn).await?; conn.commit().await?; let response = json!({ "entries": n, }); - info!("JA4db successfully updated: entries={n}"); Ok(Json(response)) }