chore: refine logging error

Author: kezhuw

src/error.rs

@@ -130,6 +130,10 @@ impl Error {
     pub(crate) fn other(message: impl Into<String>, source: impl std::error::Error + Send + Sync + 'static) -> Self {
         Self::Other(OtherError { message: Arc::new(message.into()), source: Some(Arc::new(source)) })
     }
+
+    pub(crate) fn other_from(source: impl std::error::Error + Send + Sync + 'static) -> Self {
+        Self::Other(OtherError { message: Arc::new(source.to_string()), source: Some(Arc::new(source)) })
+    }
 }
 
 assert_impl_all!(Error: Send, Sync);

src/session/depot.rs

@@ -8,7 +8,6 @@ use super::connection::Connection;
 use super::request::{MarshalledRequest, OpStat, Operation, SessionOperation, StateResponser};
 use super::types::WatchMode;
 use super::xid::Xid;
-use super::SessionId;
 use crate::error::Error;
 use crate::proto::{OpCode, PredefinedXid, RemoveWatchesRequest};
 
@@ -205,14 +204,13 @@ impl Depot {
             .any(|mode| self.watching_paths.contains_key(&(path, mode)))
     }
 
-    pub fn write_operations(&mut self, conn: &mut Connection, session_id: SessionId) -> Result<(), Error> {
+    pub fn write_operations(&mut self, conn: &mut Connection) -> Result<(), Error> {
         if !self.has_pending_writes() {
             if let Err(err) = conn.flush() {
                 if err.kind() == io::ErrorKind::WouldBlock {
                     return Ok(());
                 }
-                log::debug!("ZooKeeper session {} write failed {}", session_id, err);
-                return Err(Error::ConnectionLoss);
+                return Err(Error::other_from(err));
             }
             return Ok(());
         }
@@ -222,8 +220,7 @@ impl Depot {
                 if err.kind() == io::ErrorKind::WouldBlock {
                     return Ok(());
                 }
-                log::debug!("ZooKeeper session {} write failed {}", session_id, err);
-                return Err(Error::ConnectionLoss);
+                return Err(Error::other_from(err));
             },
             Ok(written_bytes) => written_bytes,
         };

src/session/mod.rs

@@ -369,13 +369,11 @@ impl Session {
     fn read_connection(&mut self, conn: &mut Connection, buf: &mut Vec<u8>) -> Result<(), Error> {
         match conn.read_buf(buf) {
             Ok(0) => {
-                log::debug!("ZooKeeper session {} encounters server closed", self.session_id);
                 return Err(Error::ConnectionLoss);
             },
             Err(err) => {
                 if err.kind() != io::ErrorKind::WouldBlock {
-                    log::debug!("ZooKeeper session {} encounters read err {}", self.session_id, err);
-                    return Err(Error::ConnectionLoss);
+                    return Err(Error::other_from(err));
                 }
             },
             _ => {},
@@ -418,7 +416,7 @@ impl Session {
                     self.handle_recv_buf(buf, depot)?;
                 },
                 _ = conn.writable(), if depot.has_pending_writes() || conn.wants_write() => {
-                    depot.write_operations(conn, self.session_id)?;
+                    depot.write_operations(conn)?;
                     self.last_send = Instant::now();
                 },
                 now = tick.tick() => {
@@ -450,7 +448,7 @@ impl Session {
                     self.handle_recv_buf(buf, depot)?;
                 },
                 _ = conn.writable(), if depot.has_pending_writes() || conn.wants_write() => {
-                    depot.write_operations(conn, self.session_id)?;
+                    depot.write_operations(conn)?;
                     self.last_send = Instant::now();
                 },
                 r = requester.recv(), if !channel_closed => {
@@ -464,7 +462,7 @@ impl Session {
                         continue;
                     };
                     depot.push_session(operation);
-                    depot.write_operations(conn, self.session_id)?;
+                    depot.write_operations(conn)?;
                     self.last_send = Instant::now();
                 },
                 r = unwatch_requester.recv() => if let Some((watcher_id, responser)) = r {
@@ -476,7 +474,7 @@ impl Session {
                     }
                     if self.last_ping.is_none() && now >= self.last_send + self.ping_timeout {
                         self.send_ping(depot, now);
-                        depot.write_operations(conn, self.session_id)?;
+                        depot.write_operations(conn)?;
                     }
                 },
             }