From f11f0b4d23dc1069712f2808c0c5eb5ef7363491 Mon Sep 17 00:00:00 2001
From: Bill Thiede <git@xinu.tv>
Date: Wed, 23 Apr 2025 15:25:11 -0700
Subject: [PATCH] server: migrate all use of log to tracing

---
 Cargo.lock               | 1 -
 server/Cargo.toml        | 1 -
 server/src/graphql.rs    | 3 +--
 server/src/lib.rs        | 2 +-
 server/src/newsreader.rs | 3 +--
 server/src/nm.rs         | 3 +--
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1ee65b2..1f57aa4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3083,7 +3083,6 @@ dependencies = [
  "letterbox-notmuch 0.17.18",
  "letterbox-shared 0.17.18",
  "linkify",
- "log",
  "lol_html",
  "mailparse",
  "maplit",
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 91f66cb..3c4a48d 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -30,7 +30,6 @@ html-escape = "0.2.13"
 letterbox-notmuch = { path = "../notmuch", version = "0.17.18", registry = "xinu" }
 letterbox-shared = { path = "../shared", version = "0.17.18", registry = "xinu" }
 linkify = "0.10.0"
-log = "0.4.27"
 lol_html = "2.3.0"
 mailparse = "0.16.1"
 maplit = "1.0.2"
diff --git a/server/src/graphql.rs b/server/src/graphql.rs
index 0909482..771ac99 100644
--- a/server/src/graphql.rs
+++ b/server/src/graphql.rs
@@ -9,11 +9,10 @@ use async_graphql::{
 use cacher::FilesystemCacher;
 use futures::stream;
 use letterbox_notmuch::Notmuch;
-use log::info;
 use serde::{Deserialize, Serialize};
 use sqlx::postgres::PgPool;
 use tokio::join;
-use tracing::instrument;
+use tracing::{info, instrument};
 
 #[cfg(feature = "tantivy")]
 use crate::tantivy::TantivyConnection;
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 99352e8..8b96b37 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -21,7 +21,6 @@ use cacher::{Cacher, FilesystemCacher};
 use css_inline::{CSSInliner, InlineError, InlineOptions};
 pub use error::ServerError;
 use linkify::{LinkFinder, LinkKind};
-use log::{debug, error, info, warn};
 use lol_html::{
     element, errors::RewritingError, html_content::ContentType, rewrite_str, text,
     RewriteStrSettings,
@@ -32,6 +31,7 @@ use reqwest::StatusCode;
 use scraper::{Html, Selector};
 use sqlx::types::time::PrimitiveDateTime;
 use thiserror::Error;
+use tracing::{debug, error, info, warn};
 use url::Url;
 
 use crate::{
diff --git a/server/src/newsreader.rs b/server/src/newsreader.rs
index 511538d..be989ea 100644
--- a/server/src/newsreader.rs
+++ b/server/src/newsreader.rs
@@ -3,11 +3,10 @@ use std::collections::HashMap;
 use cacher::FilesystemCacher;
 use futures::{stream::FuturesUnordered, StreamExt};
 use letterbox_shared::compute_color;
-use log::{error, info};
 use maplit::hashmap;
 use scraper::Selector;
 use sqlx::postgres::PgPool;
-use tracing::instrument;
+use tracing::{error, info, instrument};
 use url::Url;
 
 use crate::{
diff --git a/server/src/nm.rs b/server/src/nm.rs
index 2d945db..41a56ff 100644
--- a/server/src/nm.rs
+++ b/server/src/nm.rs
@@ -5,11 +5,10 @@ use std::{
 
 use letterbox_notmuch::Notmuch;
 use letterbox_shared::{compute_color, Rule};
-use log::{error, info, warn};
 use mailparse::{parse_content_type, parse_mail, MailHeader, MailHeaderMap, ParsedMail};
 use memmap::MmapOptions;
 use sqlx::{types::Json, PgPool};
-use tracing::{info_span, instrument};
+use tracing::{error, info, info_span, instrument, warn};
 
 use crate::{
     compute_offset_limit,