From 094abc3f5f4bc64463609c1f59d000905c3756db Mon Sep 17 00:00:00 2001
From: nofyso <1052470899@qq.com>
Date: Sun, 19 Jul 2026 14:53:03 +0800
Subject: [PATCH] fix: fixed log print

---
 Cargo.lock                         |  8 ++++----
 Cargo.toml                         |  2 +-
 cuscuta-entry/src/main.rs          | 12 ++++++++----
 cuscuta-worker/src/worker/clean.rs |  9 +++++++--
 cuscuta-worker/src/worker/mod.rs   |  2 +-
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a1c328d..2009c45 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -554,7 +554,7 @@ dependencies = [
 
 [[package]]
 name = "cuscuta-chilo"
-version = "0.1.7"
+version = "0.1.8"
 dependencies = [
  "axum",
  "base64",
@@ -571,7 +571,7 @@ dependencies = [
 
 [[package]]
 name = "cuscuta-common"
-version = "0.1.7"
+version = "0.1.8"
 dependencies = [
  "base64",
  "chrono",
@@ -589,7 +589,7 @@ dependencies = [
 
 [[package]]
 name = "cuscuta-entry"
-version = "0.1.7"
+version = "0.1.8"
 dependencies = [
  "anyhow",
  "axum",
@@ -631,7 +631,7 @@ dependencies = [
 
 [[package]]
 name = "cuscuta-worker"
-version = "0.1.7"
+version = "0.1.8"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/Cargo.toml b/Cargo.toml
index ba7c5a1..feac1de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.1.7"
+version = "0.1.8"
 
 [workspace.dependencies]
 anyhow = "1.0.102"
diff --git a/cuscuta-entry/src/main.rs b/cuscuta-entry/src/main.rs
index 17f0c08..148140b 100644
--- a/cuscuta-entry/src/main.rs
+++ b/cuscuta-entry/src/main.rs
@@ -40,7 +40,8 @@ use reqwest::StatusCode;
 use serde_json::json;
 use tokio::net::TcpListener;
 use tokio_util::sync::CancellationToken;
-use tower_http::trace::TraceLayer;
+use tower_http::trace::{self, TraceLayer};
+use tracing::Level;
 
 use crate::{
     endpoints::enqueue,
@@ -55,12 +56,15 @@ async fn main() {
         .init();
     tracing::info!("starting...");
     let halt_token = CancellationToken::new();
+    let trace_layer = TraceLayer::new_for_http()
+        .make_span_with(trace::DefaultMakeSpan::new().level(Level::INFO))
+        .on_request(trace::DefaultOnRequest::new().level(Level::INFO))
+        .on_response(trace::DefaultOnResponse::new().level(Level::INFO));
     let service = Router::new()
         .route("/healthz", get(healthz))
         .route("/readyz", get(readyz))
-        .route("/v1/enqueue", post(enqueue))
-        .route("/v1/query", get(query))
-        .layer(TraceLayer::new_for_http());
+        .route("/v1/enqueue", post(enqueue).layer(trace_layer.clone()))
+        .route("/v1/query", get(query).layer(trace_layer));
     let addr = TcpListener::bind("0.0.0.0:8081")
         .await
         .expect("failed to bind 0.0.0.0:8081");
diff --git a/cuscuta-worker/src/worker/clean.rs b/cuscuta-worker/src/worker/clean.rs
index 30970c0..5a7ae76 100644
--- a/cuscuta-worker/src/worker/clean.rs
+++ b/cuscuta-worker/src/worker/clean.rs
@@ -90,7 +90,7 @@ pub async fn clean_jobs(
             && !pending_friends_code.contains(&finished_job.essential.friend_code)
         {
             let friend_user_id = friend_info.user_id.to_string();
-            xxxxxx_safe_call(
+            if let Err(e) = xxxxxx_safe_call(
                 config.worker_max_retry_count,
                 config.worker_exponential_backoff_base_millis,
                 config.worker_exponential_backoff_multiplier,
@@ -106,7 +106,12 @@ pub async fn clean_jobs(
                 },
             )
             .await
-            .map_err(Error::Api)?;
+            {
+                worker_write_event!(
+                    WorkerEventType::Warn,
+                    format!("failed to delete friend: {e}")
+                );
+            }
             friends.retain(|it| it.user_id != friend_info.user_id);
         }
         let cursor_length = i64::from(finished_job.essential.cursor_length);
diff --git a/cuscuta-worker/src/worker/mod.rs b/cuscuta-worker/src/worker/mod.rs
index 3e0229a..989dfc7 100644
--- a/cuscuta-worker/src/worker/mod.rs
+++ b/cuscuta-worker/src/worker/mod.rs
@@ -79,6 +79,7 @@ pub async fn worker_loop(cancellation_token: &CancellationToken) -> WorkerResult
     WORKER_ID.get_or_init(|| worker_id.clone());
     while !cancellation_token.is_cancelled() {
         if let Err(e) = internal_loop(&mut current_jobs, &mut cursor, &mut friends).await {
+            worker_write_event!(WorkerEventType::Warn, format!("worker loop failed: {e}"));
             if let Error::Api(api_error) = &e {
                 match api_error {
                     api::Error::Network(_) => {}
@@ -92,7 +93,6 @@ pub async fn worker_loop(cancellation_token: &CancellationToken) -> WorkerResult
                     }
                 }
             }
-            worker_write_event!(WorkerEventType::Warn, format!("worker loop failed: {e}"));
             sleep(Duration::from_secs(1)).await;
         }
     }