Merge pull request #28 from noctisynth/release/2.1.1

release: 2.1.1
noctisynth · Jun 26, 2024 · f2e7ea7 · f2e7ea7
2 parents da23803 + 8d4c1dc
commit f2e7ea7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/oblivion/Cargo.toml b/oblivion/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "oblivion"
-version = "2.1.0"
+version = "2.1.1"
 authors = ["苏向夜 <fu050409@163.com>"]
 description = "Rust High Concurrency Implementation of Oblivion, an End-to-End Encryption Protocol Based on ECDHE Encryption Algorithm"
 license = "AGPL-3.0"

diff --git a/oblivion/src/bin/main.rs b/oblivion/src/bin/main.rs
@@ -8,8 +8,8 @@ use oblivion::path_route;
 use oblivion::types::server;
 use oblivion_codegen::async_route;
 use serde_json::json;
-use tokio::time::Instant;
 use std::env::args;
+use tokio::time::Instant;
 
 #[async_route]
 fn handler(_sess: Session) -> server::Result {

diff --git a/oblivion/src/models/server.rs b/oblivion/src/models/server.rs
@@ -126,22 +126,19 @@ pub async fn handle(router: Arc<Router>, stream: TcpStream, peer: SocketAddr) {
     let now = Instant::now();
     #[cfg(feature = "perf")]
     println!("=================");
-    match _handle(&router, stream, peer).await {
-        Ok(()) => {}
-        Err(error) => {
-            eprintln!(
-                "{} <-> [{}] \"{}\" {}",
-                peer.ip().to_string().cyan(),
-                Local::now().format("%d/%m/%Y %H:%M:%S"),
-                "CONNECT - Oblivion/2.0".yellow(),
-                "501".red()
-            );
-            eprintln!("{}", error.to_string().bright_red());
-            #[cfg(feature = "bench")]
-            {
-                eprintln!("An error occurred in handling runtime unexpectedly.");
-                process::exit(1);
-            }
+    if let Err(error) = _handle(&router, stream, peer).await {
+        eprintln!(
+            "{} <-> [{}] \"{}\" {}",
+            peer.ip().to_string().cyan(),
+            Local::now().format("%d/%m/%Y %H:%M:%S"),
+            "CONNECT - Oblivion/2.0".yellow(),
+            "501".red()
+        );
+        eprintln!("{}", error.to_string().bright_red());
+        #[cfg(feature = "bench")]
+        {
+            eprintln!("An error occurred in handling runtime unexpectedly.");
+            process::exit(1);
         }
     }
     #[cfg(feature = "perf")]