Skip to content

Commit 7ccb9a5

Browse files
committed
feat:v2.27.0
1 parent 3913a44 commit 7ccb9a5

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "hyperlane"
3-
version = "2.26.0"
3+
version = "2.27.0"
44
edition = "2021"
55
authors = ["ltpp-universe <root@ltpp.vip>"]
66
license = "MIT"

src/server/impl.rs

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ impl Server {
9797
self
9898
}
9999

100+
fn common_log(data: &String) -> String {
101+
format!("{}: {}{}", current_time(), data.to_string(), HTTP_BR)
102+
}
103+
100104
pub fn listen(&mut self) -> &mut Self {
101105
self.init();
102106
let mut host: &str = EMPTY_STR;
@@ -112,6 +116,13 @@ impl Server {
112116
let listener_res: Result<TcpListener, Error> =
113117
TcpListener::bind(&addr).map_err(|e| Error::TcpBindError(e.to_string()));
114118
if listener_res.is_err() {
119+
let _ = self.get_tmp().write().and_then(|tmp| {
120+
tmp.get_log().log_error(
121+
format!("{}", listener_res.err().unwrap_or(Error::Unknown)),
122+
Self::common_log,
123+
);
124+
Ok(())
125+
});
115126
return self;
116127
}
117128
let tcp_listener: TcpListener = listener_res.unwrap();
@@ -165,16 +176,15 @@ impl Server {
165176
});
166177
if let Err(err) = thread_result {
167178
let _ = tmp_arc.read().and_then(|tem| {
168-
let err_str: &str = if let Some(msg) = err.downcast_ref::<&str>() {
169-
msg
179+
let err_str: String = if let Some(msg) = err.downcast_ref::<String>() {
180+
msg.to_owned()
170181
} else if let Some(msg) = err.downcast_ref::<String>() {
171-
msg
182+
msg.to_owned()
172183
} else {
173-
&format!("{:#?}", err)
184+
format!("{:?}", err)
174185
};
175-
tem.get_log().log_error(format!("{}", err_str), |data| {
176-
format!("{}: {}{}", current_time(), data.to_string(), HTTP_BR)
177-
});
186+
tem.get_log()
187+
.log_error(format!("{}", err_str), Self::common_log);
178188
Ok(())
179189
});
180190
}

0 commit comments

Comments
 (0)