From e6ed9ca43e730eb7dac0402d89b183516b3e4a30 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Tue, 26 Mar 2024 14:43:53 +0800
Subject: [PATCH] fix compile

Signed-off-by: tison <wander4096@gmail.com>
---
 src/auth/src/error.rs                                  |  2 +-
 src/auth/src/user_provider/watch_file_user_provider.rs |  6 ++----
 src/servers/src/error.rs                               |  2 +-
 src/servers/src/tls.rs                                 | 10 +++++-----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/auth/src/error.rs b/src/auth/src/error.rs
index bc484d25b7..bb9f37e83b 100644
--- a/src/auth/src/error.rs
+++ b/src/auth/src/error.rs
@@ -66,7 +66,7 @@ pub enum Error {
 
     #[snafu(display("Failed to initialize a watcher for file {}", path))]
     FileWatch {
-        path: Option<String>,
+        path: String,
         #[snafu(source)]
         error: notify::Error,
     },
diff --git a/src/auth/src/user_provider/watch_file_user_provider.rs b/src/auth/src/user_provider/watch_file_user_provider.rs
index d268cb51b6..f93a2f2ed3 100644
--- a/src/auth/src/user_provider/watch_file_user_provider.rs
+++ b/src/auth/src/user_provider/watch_file_user_provider.rs
@@ -45,13 +45,11 @@ impl WatchFileUserProvider {
 
         let (tx, rx) = channel::<DebounceEventResult>();
         let mut debouncer = new_debouncer(Duration::from_secs(1), None, tx)
-            .context(FileWatchSnafu { path: None })?;
+            .context(FileWatchSnafu { path: "<none>" })?;
         debouncer
             .watcher()
             .watch(Path::new(filepath), RecursiveMode::NonRecursive)
-            .context(FileWatchSnafu {
-                path: Some(filepath),
-            })?;
+            .context(FileWatchSnafu { path: filepath })?;
 
         let filepath = filepath.to_string();
         std::thread::spawn(move || {
diff --git a/src/servers/src/error.rs b/src/servers/src/error.rs
index 18a9f68c9a..2d47547e65 100644
--- a/src/servers/src/error.rs
+++ b/src/servers/src/error.rs
@@ -451,7 +451,7 @@ pub enum Error {
 
     #[snafu(display("Failed to initialize a watcher for file {}", path))]
     FileWatch {
-        path: Option<String>,
+        path: String,
         #[snafu(source)]
         error: notify::Error,
     },
diff --git a/src/servers/src/tls.rs b/src/servers/src/tls.rs
index bd6a96e8c1..2055081012 100644
--- a/src/servers/src/tls.rs
+++ b/src/servers/src/tls.rs
@@ -200,20 +200,20 @@ pub fn maybe_watch_tls_config(tls_server_config: Arc<ReloadableTlsServerConfig>)
     let tls_server_config_for_watcher = tls_server_config.clone();
 
     let (tx, rx) = channel::<notify::Result<notify::Event>>();
-    let mut watcher = notify::recommended_watcher(tx).context(FileWatchSnafu { path: None })?;
+    let mut watcher = notify::recommended_watcher(tx).context(FileWatchSnafu { path: "<none>" })?;
 
     let cert_path = tls_server_config.get_tls_option().cert_path();
     watcher
         .watch(cert_path, RecursiveMode::NonRecursive)
-        .context(FileWatchSnafu {
-            path: Some(cert_path),
+        .with_context(|_| FileWatchSnafu {
+            path: cert_path.display().to_string(),
         })?;
 
     let key_path = tls_server_config.get_tls_option().key_path();
     watcher
         .watch(key_path, RecursiveMode::NonRecursive)
-        .context(FileWatchSnafu {
-            path: Some(key_path),
+        .with_context(|_| FileWatchSnafu {
+            path: key_path.display().to_string(),
         })?;
 
     std::thread::spawn(move || {