Merge pull request #146 from gngpp/feat

feat: Support observing daemon process memory usage

Author: 0x676e67

Cargo.toml

@@ -32,6 +32,7 @@ tokio-util = "0.7.10"
 jsonwebtokens = "1.2.0"
 mimalloc = { version = "0.1.39", default-features = false, optional = true }
 daemonize = "0.5.0"
+sysinfo = { version = "0.30.7", default-features = false }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 tower-http = { version = "0.4.4", default-features = false, features = ["trace"]}

README.md

@@ -36,8 +36,8 @@ Commands:
   run        Run thunder
   start      Start thunder daemon
   stop       Stop thunder daemon
-  status     Show the Http server daemon process
   log        Show the Http server daemon log
+  ps         Show the Http server daemon process
   help       Print this message or the help of the given subcommand(s)
 
 Options:
@@ -73,7 +73,7 @@ thunder start
 thunder stop
 
 # 查看运行状态
-thunder status
+thunder ps
 
 # 查看运行日志
 thunder log

src/daemon.rs

@@ -23,18 +23,18 @@ pub fn check_root() {
 }
 
 /// Get the pid of the daemon
-pub fn get_pid() -> Option<String> {
+pub fn get_pid() -> Option<i32> {
     if let Ok(data) = std::fs::read(PID_PATH) {
         let binding = String::from_utf8(data).expect("pid file is not utf8");
-        return Some(binding.trim().to_string());
+        return Some(binding.trim().parse().expect("pid file is not a number"));
     }
     None
 }
 
 /// Start the daemon
 pub fn start() -> Result<()> {
     if let Some(pid) = get_pid() {
-        println!("Thunder is already running with pid: {}", pid);
+        println!("Thunder is already running with pid: {pid}");
         return Ok(());
     }
 
@@ -81,7 +81,6 @@ pub fn stop() -> Result<()> {
     check_root();
 
     if let Some(pid) = get_pid() {
-        let pid = pid.parse::<i32>()?;
         for _ in 0..360 {
             if signal::kill(Pid::from_raw(pid), signal::SIGINT).is_err() {
                 break;
@@ -96,9 +95,30 @@ pub fn stop() -> Result<()> {
 
 /// Show the status of the daemon
 pub fn status() -> Result<()> {
+    use sysinfo::System;
     match get_pid() {
-        Some(pid) => println!("Thunder is running with pid: {}", pid),
-        None => println!("Thunder is not running"),
+        Some(pid) => {
+            let mut sys = System::new();
+
+            // First we update all information of our `System` struct.
+            sys.refresh_all();
+
+            // Display processes ID
+            let process = sys
+                .processes()
+                .into_iter()
+                .find(|(raw_pid, _)| raw_pid.as_u32().eq(&(pid as u32)))
+                .ok_or_else(|| anyhow::anyhow!("openai is not running"))?;
+
+            println!("{:<6} {:<6}  {:<6}", "PID", "CPU(%)", "MEM(MB)");
+            println!(
+                "{:<6}   {:<6.1}  {:<6.1}",
+                process.0,
+                process.1.cpu_usage(),
+                (process.1.memory() as f64) / 1024.0 / 1024.0
+            );
+        }
+        None => println!("openai is not running"),
     }
     Ok(())
 }

src/main.rs

@@ -39,10 +39,10 @@ pub enum Commands {
     Start(ServeConfig),
     /// Stop thunder daemon
     Stop,
-    /// Show the Http server daemon process
-    Status,
     /// Show the Http server daemon log
     Log,
+    /// Show the Http server daemon process
+    PS,
 }
 
 #[derive(Args, Clone)]
@@ -190,19 +190,21 @@ fn main() -> Result<()> {
         }
         Commands::Run(server_config) => {
             let install_config = InstallConfig::read_from_file()?;
+            #[cfg(target_os = "linux")]
             before_action(&install_config)?;
             serve::Serve::new(server_config, install_config).run()?;
         }
         Commands::Start(server_config) => {
             let install_config = InstallConfig::read_from_file()?;
+            #[cfg(target_os = "linux")]
             before_action(&install_config)?;
             daemon::start()?;
             serve::Serve::new(server_config, install_config).run()?;
         }
         Commands::Stop => {
             daemon::stop()?;
         }
-        Commands::Status => {
+        Commands::PS => {
             daemon::status()?;
         }
         Commands::Log => {
@@ -213,13 +215,11 @@ fn main() -> Result<()> {
 }
 
 /// Running before the daemon starts, execute the following code
+#[cfg(target_os = "linux")]
 fn before_action(install_config: &InstallConfig) -> Result<()> {
-    #[cfg(target_os = "linux")]
     use nix::mount::MsFlags;
 
-    #[cfg(target_os = "linux")]
     let _ = nix::mount::umount(&install_config.mount_bind_download_path);
-    #[cfg(target_os = "linux")]
     if nix::mount::mount(
         Some(&install_config.download_path),
         &install_config.mount_bind_download_path,