Add output for jvv service listen command results

3 files changed, 27 insertions, 12 deletions

diff --git a/locales/help_docs/en.yml b/locales/help_docs/en.yml
index c72754c..5dfcb9d 100644
--- a/locales/help_docs/en.yml
+++ b/locales/help_docs/en.yml
@@ -61,7 +61,6 @@ jvv:
 
   fail:
     jvcs: "JustEnoughVCS Error: %{err}"
-
     no_vault_here: No vault found here
 
     tokio:
@@ -80,9 +79,7 @@ jvv:
         If you wish to use this directory as a vault, please use jvv init --help to view related help
 
       vault_init_failed: Failed to initialize vault!
-
       member_ids_failed: Failed to get member IDs!
-
       ref_sheet_not_found: Reference sheet `ref` not found, but it should exist!
 
     create:
@@ -95,6 +92,11 @@ jvv:
       register: Failed to create member! Please check if a member with the same name already exists
       list: Failed to get member ID!
 
+    service:
+      listen_done: |
+        Server forced to close due to error!
+        Error message: %{error}
+
   success:
     here:
       info: |
@@ -122,7 +124,8 @@ jvv:
         status_key_registered: (Registered)
 
     service:
-      listen: Listening for client connections in vault `%{path}` ...
+      listen_start: Listening for client connections in vault `%{path}` ...
+      listen_done: Server shutdown!
 
 jv:
   help: |
diff --git a/locales/help_docs/zh-CN.yml b/locales/help_docs/zh-CN.yml
index 442e7f9..548d029 100644
--- a/locales/help_docs/zh-CN.yml
+++ b/locales/help_docs/zh-CN.yml
@@ -59,7 +59,6 @@ jvv:
 
   fail:
     jvcs: JustEnoughVCS 错误：%{err}
-
     no_vault_here: 此处并没有找到库文件
 
     tokio:
@@ -78,9 +77,7 @@ jvv:
         若您希望将该目录作为库，请使用 jvv init --help 查看相关帮助
 
       vault_init_failed: 初始化库失败！
-
       member_ids_failed: 获得成员 ID 失败！
-
       ref_sheet_not_found: 未找到参照表 `ref`，该参照表理应存在！
 
     create:
@@ -93,6 +90,11 @@ jvv:
       register: 创建成员失败！请检查是否存在同名的成员
       list: 获取成员 ID 失败！
 
+    service:
+      listen_done: |
+        服务端被错误强制关闭！
+        错误信息：%{error}
+
   success:
     here:
       info: |
@@ -102,7 +104,6 @@ jvv:
         **提示**：若要启动服务端，请运行 jvv service listen
 
     create: 成功在 `%{name}` 创建库！
-
     init: 在此处初始化库成功！
 
     member:
@@ -118,7 +119,8 @@ jvv:
         status_key_registered: (公钥存在)
 
     service:
-      listen: 正在库 `%{path}` 监听来自客户端的连接 ...
+      listen_start: 正在库 `%{path}` 监听来自客户端的连接 ...
+      listen_done: 服务端运行结束！
 
 jv:
   help: |
diff --git a/src/bin/jvv.rs b/src/bin/jvv.rs
index 1886daa..f6fbeaa 100644
--- a/src/bin/jvv.rs
+++ b/src/bin/jvv.rs
@@ -19,7 +19,7 @@ use just_enough_vcs::{
 use just_enough_vcs_cli::utils::{
     build_env_logger::build_env_logger, lang_selector::current_locales, md_colored::md,
 };
-use log::info;
+use log::{error, info};
 use rust_i18n::{set_locale, t};
 use tokio::fs::{self};
 
@@ -586,7 +586,7 @@ async fn jvv_service_listen(args: ListenArgs) {
         info!(
             "{}",
             t!(
-                "jvv.success.service.listen",
+                "jvv.success.service.listen_start",
                 path = match current_vault.file_name() {
                     Some(name) => name.to_string_lossy(),
                     None => std::borrow::Cow::Borrowed("unknown"),
@@ -595,5 +595,15 @@ async fn jvv_service_listen(args: ListenArgs) {
         )
     }
 
-    let _ = server_entry(current_vault).await;
+    match server_entry(current_vault).await {
+        Ok(_) => {
+            info!("{}", t!("jvv.success.service.listen_done").trim());
+        }
+        Err(e) => {
+            error!(
+                "{}",
+                t!("jvv.fail.service.listen_done", error = e.to_string()).trim()
+            );
+        }
+    }
 }