From e3e4175f513d8d6e19075d7cd2ec47f55f000e25 Mon Sep 17 00:00:00 2001 From: Rushmore75 Date: Tue, 18 Mar 2025 15:25:56 -0600 Subject: [PATCH] logging improvements --- src/db.rs | 4 ++-- src/main.rs | 4 ++-- src/s3.rs | 6 ++++-- src/setup.surql | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/db.rs b/src/db.rs index dd4f81f..9b14d89 100644 --- a/src/db.rs +++ b/src/db.rs @@ -87,9 +87,9 @@ impl Website { } } - #[instrument(skip_all)] + #[instrument(name = "surql_store", skip_all)] pub async fn store(&self, db: &Surreal) -> Option { - let t = Timer::start("Stored page"); + let t = Timer::start("Stored link"); let _ = t; // check if it's been gone thru before let mut response = db diff --git a/src/main.rs b/src/main.rs index aaffb91..2475cb5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -53,8 +53,8 @@ async fn main() { surreal_username: "root", surreal_password: "root", surreal_ns: "test", - surreal_db: "v1.11.2", - s3_bucket: "v1.11.2", + surreal_db: "v1.12", + s3_bucket: "v1.12", s3_url: "http://localhost:9000", s3_access_key: "8UO76z8wCs9DnpxSbQUY", s3_secret_key: "xwKVMpf2jzgprsdo85Dvo74UmO84y0aRrAUorYY5", diff --git a/src/s3.rs b/src/s3.rs index a54d84c..4439df2 100644 --- a/src/s3.rs +++ b/src/s3.rs @@ -10,7 +10,7 @@ use minio::s3::{ use tracing::{instrument, trace, warn}; use url::Url; -use crate::Config; +use crate::{Config, Timer}; const CUSTOM_ENGINE: engine::GeneralPurpose = engine::GeneralPurpose::new(&alphabet::URL_SAFE, general_purpose::NO_PAD); @@ -60,8 +60,10 @@ impl S3 { }) } - #[instrument(skip_all)] + #[instrument(name = "s3_store", skip_all)] pub async fn store(&self, data: &str, url: &Url) { + let t = Timer::start("Stored page"); + let _ = t; // prevent compiler drop if let Some(domain) = url.domain() { let filename = domain.to_owned() + url.path(); diff --git a/src/setup.surql b/src/setup.surql index 4271c79..61c020c 100644 --- a/src/setup.surql +++ b/src/setup.surql @@ -1,2 +1,3 @@ DEFINE TABLE IF NOT EXISTS website SCHEMALESS; DEFINE FIELD IF NOT EXISTS accessed_at ON TABLE website VALUE time::now(); +DEFINE INDEX IF NOT EXISTS idx ON TABLE website COLUMNS site UNIQUE;