servly 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

servly/cli.py

@@ -204,10 +204,27 @@ def handle_list(manager: ServiceManager) -> bool:
         is_running = manager.is_running(name)
         pid = manager.get_service_pid(name)
         
+        # 获取服务运行时间
+        uptime_seconds = manager.get_uptime(name) if is_running else None
+        uptime = manager.format_uptime(uptime_seconds) if is_running else "-"
+        
+        # 获取 CPU 和内存使用情况
+        cpu_mem_stats = {}
+        if is_running:
+            stats = manager.get_process_stats(name)
+            cpu_mem_stats["cpu"] = manager.format_cpu_percent(stats["cpu_percent"])
+            cpu_mem_stats["memory"] = manager.format_memory(stats["memory_mb"], stats["memory_percent"])
+        else:
+            cpu_mem_stats["cpu"] = "0%"
+            cpu_mem_stats["memory"] = "0b"
+        
         services.append({
             "name": name,
             "status": "running" if is_running else "stopped",
-            "pid": pid
+            "pid": pid,
+            "uptime": uptime,
+            "cpu": cpu_mem_stats["cpu"],
+            "memory": cpu_mem_stats["memory"]
         })
     
     # 使用Rich表格显示服务列表

servly/logs.py

@@ -15,6 +15,7 @@ from rich.text import Text
 from rich.panel import Panel
 from rich.table import Table
 from rich.live import Live
+from rich import box
 
 # 自定义Rich主题
 custom_theme = Theme({
@@ -77,25 +78,31 @@ def print_success(message: str):
     console.print(f"{Emojis.RUNNING} {message}", style="running")
 
 def print_service_table(services: List[Dict]):
-    """打印服务状态表格"""
-    table = Table(show_header=True, header_style="header", expand=True)
-    table.add_column("名称", style="cyan")
-    table.add_column("状态")
-    table.add_column("PID")
+    """打印服务状态表格，PM2风格紧凑布局"""
+    table = Table(show_header=True, header_style="header", expand=True, box=box.SIMPLE)
+    
+    # PM2风格紧凑表头
+    table.add_column("name", style="cyan")
+    table.add_column("pid", justify="right")
+    table.add_column("uptime", justify="right")
+    table.add_column("cpu", justify="right")
+    table.add_column("mem", justify="right")
     
     for service in services:
         name = service["name"]
-        status = service["status"]
         pid = service["pid"] or "-"
+        uptime = service.get("uptime", "-")
+        cpu = service.get("cpu", "0%")
+        memory = service.get("memory", "0b")
         
-        status_style = "running" if status == "running" else "stopped"
-        status_emoji = Emojis.RUNNING if status == "running" else Emojis.STOPPED
-        status_text = f"{status_emoji} {status.upper()}"
+        status_style = "running" if service["status"] == "running" else "stopped"
         
         table.add_row(
-            name,
-            Text(status_text, style=status_style),
-            Text(str(pid), style=status_style)
+            Text(name, style=status_style),
+            Text(str(pid), style=status_style),
+            Text(str(uptime), style=status_style),
+            Text(str(cpu), style=status_style),
+            Text(str(memory), style=status_style)
         )
     
     console.print(table)

servly/service.py

@@ -7,8 +7,10 @@ import signal
 import yaml
 import logging
 import time
+import psutil
 from pathlib import Path
-from typing import Dict, Union, List, Optional, Any
+from datetime import datetime
+from typing import Dict, Union, List, Optional, Any, Tuple
 
 logger = logging.getLogger(__name__)
 
@@ -22,13 +24,35 @@ class ServiceManager:
         self.servly_dir = Path(config_dir) / servly_dir
         self.pid_dir = self.servly_dir / "pids"
         self.log_dir = self.servly_dir / "logs"
+        # 存储服务启动时间，用于计算运行时长
+        self.start_times = {}
         self._ensure_dirs()
         self.services = self._load_config()
+        # 加载现有的服务启动时间
+        self._load_start_times()
         
     def _ensure_dirs(self):
         """Create required directories if they don't exist."""
         self.pid_dir.mkdir(parents=True, exist_ok=True)
         self.log_dir.mkdir(parents=True, exist_ok=True)
+    
+    def _load_start_times(self):
+        """加载已运行服务的启动时间"""
+        for service_name in self.get_service_names():
+            if self.is_running(service_name):
+                # 尝试从文件获取启动时间，如果没有则使用当前时间
+                start_time_file = self.pid_dir / f"{service_name}.time"
+                if start_time_file.exists():
+                    try:
+                        with open(start_time_file, "r") as f:
+                            timestamp = float(f.read().strip())
+                            self.start_times[service_name] = timestamp
+                    except (ValueError, IOError):
+                        # 如果文件无法读取或格式不正确，使用当前时间
+                        self.start_times[service_name] = time.time()
+                else:
+                    # 如果没有时间文件，使用当前时间
+                    self.start_times[service_name] = time.time()
         
     def _load_config(self) -> Dict[str, Any]:
         """Load service configurations from servly.yml."""
@@ -83,10 +107,45 @@ class ServiceManager:
             else:
                 # Clean up stale PID file
                 os.remove(pid_file)
+                # 删除相关的启动时间记录
+                if service_name in self.start_times:
+                    del self.start_times[service_name]
+                start_time_file = self.pid_dir / f"{service_name}.time"
+                if start_time_file.exists():
+                    os.remove(start_time_file)
                 return None
         except (ValueError, FileNotFoundError):
             return None
     
+    def get_uptime(self, service_name: str) -> Optional[float]:
+        """获取服务运行时间（以秒为单位）"""
+        if service_name in self.start_times and self.is_running(service_name):
+            return time.time() - self.start_times[service_name]
+        return None
+    
+    def format_uptime(self, uptime_seconds: Optional[float]) -> str:
+        """将运行时间格式化为易读格式"""
+        if uptime_seconds is None:
+            return "-"
+        
+        # 转换为整数秒
+        seconds = int(uptime_seconds)
+        
+        # 计算天、小时、分钟、秒
+        days, seconds = divmod(seconds, 86400)
+        hours, seconds = divmod(seconds, 3600)
+        minutes, seconds = divmod(seconds, 60)
+        
+        # 格式化为易读字符串
+        if days > 0:
+            return f"{days}d {hours}h"
+        elif hours > 0:
+            return f"{hours}h {minutes}m"
+        elif minutes > 0:
+            return f"{minutes}m {seconds}s"
+        else:
+            return f"{seconds}s"
+    
     def _is_process_running(self, pid: int) -> bool:
         """Check if process with given PID is running."""
         try:
@@ -160,6 +219,15 @@ class ServiceManager:
             with open(self.get_pid_file(service_name), 'w') as f:
                 f.write(str(process.pid))
                 
+            # 记录启动时间
+            start_time = time.time()
+            self.start_times[service_name] = start_time
+            
+            # 保存启动时间到文件
+            start_time_file = self.pid_dir / f"{service_name}.time"
+            with open(start_time_file, 'w') as f:
+                f.write(str(start_time))
+                
             logger.info(f"Started service '{service_name}' with PID {process.pid}")
             return True
             
@@ -194,6 +262,15 @@ class ServiceManager:
             if os.path.exists(pid_file):
                 os.remove(pid_file)
                 
+            # 清理启动时间记录
+            if service_name in self.start_times:
+                del self.start_times[service_name]
+            
+            # 删除启动时间文件
+            start_time_file = self.pid_dir / f"{service_name}.time"
+            if start_time_file.exists():
+                os.remove(start_time_file)
+                
             logger.info(f"Stopped service '{service_name}'")
             return True
             
@@ -202,6 +279,16 @@ class ServiceManager:
             pid_file = self.get_pid_file(service_name)
             if os.path.exists(pid_file):
                 os.remove(pid_file)
+            
+            # 清理启动时间记录
+            if service_name in self.start_times:
+                del self.start_times[service_name]
+            
+            # 删除启动时间文件
+            start_time_file = self.pid_dir / f"{service_name}.time"
+            if start_time_file.exists():
+                os.remove(start_time_file)
+                
             logger.info(f"Service '{service_name}' was not running")
             return True
             
@@ -212,4 +299,51 @@ class ServiceManager:
     def restart(self, service_name: str) -> bool:
         """Restart a service."""
         self.stop(service_name)
-        return self.start(service_name)
+        return self.start(service_name)
+    
+    def get_process_stats(self, service_name: str) -> Dict[str, Any]:
+        """获取进程的 CPU 和内存使用情况"""
+        pid = self.get_service_pid(service_name)
+        stats = {"cpu_percent": None, "memory_percent": None, "memory_mb": None}
+        
+        if pid:
+            try:
+                process = psutil.Process(pid)
+                # 获取 CPU 使用百分比 (非阻塞模式)
+                stats["cpu_percent"] = process.cpu_percent(interval=0)
+                
+                # 获取内存使用情况
+                memory_info = process.memory_info()
+                stats["memory_mb"] = memory_info.rss / (1024 * 1024)  # 转换为 MB
+                
+                # 计算内存使用百分比
+                stats["memory_percent"] = process.memory_percent()
+                
+                return stats
+            except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+                # 如果进程已不存在或无法访问，返回默认值
+                pass
+                
+        return stats
+    
+    def format_cpu_percent(self, cpu_percent: Optional[float]) -> str:
+        """格式化 CPU 使用百分比"""
+        if cpu_percent is None:
+            return "0%"
+        return f"{cpu_percent:.1f}%"
+    
+    def format_memory(self, memory_mb: Optional[float], memory_percent: Optional[float]) -> str:
+        """格式化内存使用情况"""
+        if memory_mb is None:
+            return "0b"
+        
+        # 如果小于 1MB，显示为 KB
+        if memory_mb < 1:
+            return f"{int(memory_mb * 1024)}kb"
+        
+        # 如果大于 1GB，显示为 GB
+        if memory_mb > 1024:
+            return f"{memory_mb/1024:.1f}gb"
+            
+        # 否则显示为 MB
+        return f"{int(memory_mb)}mb"

{servly-0.3.0.dist-info → servly-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: servly
-Version: 0.3.0
+Version: 0.3.1
 Summary: simple process manager
 Author-email: simpxx <simpxx@gmail.com>
 License: MIT
@@ -10,6 +10,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
+Requires-Dist: psutil>=7.0.0
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=14.0.0
 

servly-0.3.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+servly/__init__.py,sha256=HT8I94RyP6_gNoVJWOVSkeOEQIl3QnT60zCP2PJVon0,73
+servly/cli.py,sha256=2x8jI8k24_U6JiNgTbHcoJDjRXuC7fgVDG1rEprc-tw,10337
+servly/logs.py,sha256=MWnQbSR_PjLRDm9JLIO3uvEkw57DZey0Ocbu6glFJpc,8109
+servly/service.py,sha256=-qm7slEELm8PG_NErviezI6iKuG08FID2wvXSc1NBYg,13722
+servly-0.3.1.dist-info/METADATA,sha256=NHsI2XN3X13y_8NmLjj-KNJeWzX16U278tzSlzEHtoI,2687
+servly-0.3.1.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+servly-0.3.1.dist-info/entry_points.txt,sha256=enHpE2d9DYdzfIWBcnIjuIkcNVk118xghL0AeTUL0Yg,43
+servly-0.3.1.dist-info/top_level.txt,sha256=JLi7GX0KwWF-mh8i1-lVJ2q4SO1KfI2CNxQk_VNfNZE,7
+servly-0.3.1.dist-info/RECORD,,

servly-0.3.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-servly/__init__.py,sha256=HT8I94RyP6_gNoVJWOVSkeOEQIl3QnT60zCP2PJVon0,73
-servly/cli.py,sha256=YmaKXHRZm77MJnMZ400EkuNayjlBw5UDfM5Y6T2z5x0,9583
-servly/logs.py,sha256=pGU91fnWKHL5NprGrke7jNrLea23TXr3K3AF7J1KEQM,7802
-servly/service.py,sha256=c4UrS1smK3NqEsERbCwjQUo1SKSQb1TaIbAzM1lrHeM,8253
-servly-0.3.0.dist-info/METADATA,sha256=PD-b0BWdppEy69aREDOCDfWvpYf6G5elvHNF28MdPhY,2658
-servly-0.3.0.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-servly-0.3.0.dist-info/entry_points.txt,sha256=enHpE2d9DYdzfIWBcnIjuIkcNVk118xghL0AeTUL0Yg,43
-servly-0.3.0.dist-info/top_level.txt,sha256=JLi7GX0KwWF-mh8i1-lVJ2q4SO1KfI2CNxQk_VNfNZE,7
-servly-0.3.0.dist-info/RECORD,,