servly 0.2.0__tar.gz → 0.3.1__tar.gz

{servly-0.2.0 → servly-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: servly
-Version: 0.2.0
+Version: 0.3.1
 Summary: simple process manager
 Author-email: simpxx <simpxx@gmail.com>
 License: MIT
@@ -10,7 +10,9 @@ 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
 

{servly-0.2.0 → servly-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "servly"
-version = "0.2.0"
+version = "0.3.1"
 description = "simple process manager"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -19,7 +19,9 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
+    "psutil>=7.0.0",
     "pyyaml>=6.0.2",
+    "rich>=14.0.0",
 ]
 
 [project.scripts]

servly-0.3.1/servly/cli.py

@@ -0,0 +1,287 @@
+#!/usr/bin/env python3
+"""
+Command-line interface for Servly process manager.
+使用Rich库进行终端输出格式化
+"""
+import os
+import sys
+import argparse
+import logging
+from pathlib import Path
+from typing import List, Dict, Optional
+
+from servly.service import ServiceManager
+from servly.logs import LogManager, Emojis
+from servly.logs import console, print_header, print_info, print_warning, print_error, print_success, print_service_table
+
+from rich.logging import RichHandler
+from rich.traceback import install
+from rich.markup import escape
+
+# 安装Rich的异常格式化器
+install()
+
+# 配置Rich日志处理
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(message)s",
+    datefmt="[%X]",
+    handlers=[RichHandler(rich_tracebacks=True, markup=True)]
+)
+
+logger = logging.getLogger("servly")
+
+def setup_arg_parser() -> argparse.ArgumentParser:
+    """设置命令行参数解析器"""
+    parser = argparse.ArgumentParser(
+        description=f"{Emojis.SERVICE} Servly - Modern process manager",
+        formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    
+    # 全局参数
+    parser.add_argument('-f', '--config', 
+                      help='配置文件路径 (默认: servly.yml)',
+                      default='servly.yml')
+    
+    subparsers = parser.add_subparsers(dest='command', help='要执行的命令')
+    
+    # Start 命令
+    start_parser = subparsers.add_parser('start', help=f'{Emojis.START} 启动服务')
+    start_parser.add_argument('service', nargs='?', default='all', 
+                            help='服务名称或 "all" 启动所有服务')
+    
+    # Stop 命令
+    stop_parser = subparsers.add_parser('stop', help=f'{Emojis.STOP} 停止服务')
+    stop_parser.add_argument('service', nargs='?', default='all',
+                           help='服务名称或 "all" 停止所有服务')
+    
+    # Restart 命令
+    restart_parser = subparsers.add_parser('restart', help=f'{Emojis.RESTART} 重启服务')
+    restart_parser.add_argument('service', nargs='?', default='all',
+                              help='服务名称或 "all" 重启所有服务')
+    
+    # Log 命令
+    log_parser = subparsers.add_parser('log', help=f'{Emojis.LOG} 查看服务日志')
+    log_parser.add_argument('service', nargs='?', default='all',
+                          help='服务名称或 "all" 查看所有日志')
+    log_parser.add_argument('--no-follow', '-n', action='store_true',
+                          help='不实时跟踪日志')
+    log_parser.add_argument('--lines', '-l', type=int, default=10,
+                          help='初始显示的行数')
+    
+    # List 命令 - 保留原命令名，不改为 ps
+    list_parser = subparsers.add_parser('list', help='列出服务')
+    
+    return parser
+
+def handle_start(manager: ServiceManager, service_name: str) -> bool:
+    """处理启动命令"""
+    if service_name == 'all':
+        service_names = manager.get_service_names()
+        if not service_names:
+            print_warning("配置中没有定义任何服务。")
+            return False
+        
+        console.print(f"{Emojis.START} 正在启动所有服务...", style="running")
+        success = True
+        for name in service_names:
+            if not manager.start(name):
+                print_error(f"启动服务 '{name}' 失败")
+                success = False
+            else:
+                print_success(f"服务 '{name}' 已成功启动")
+        
+        if success:
+            print_success("所有服务已成功启动！")
+        else:
+            print_warning("有些服务启动失败，请检查日志获取详情。")
+        
+        return success
+    else:
+        result = manager.start(service_name)
+        if result:
+            print_success(f"服务 '{service_name}' 已成功启动")
+        else:
+            print_error(f"启动服务 '{service_name}' 失败")
+        return result
+
+def handle_stop(manager: ServiceManager, service_name: str) -> bool:
+    """处理停止命令"""
+    if service_name == 'all':
+        service_names = manager.get_running_services()
+        if not service_names:
+            console.print(f"{Emojis.INFO} 当前没有正在运行的服务。", style="dim")
+            return True
+        
+        console.print(f"{Emojis.STOP} 正在停止所有服务...", style="warning")
+        success = True
+        for name in service_names:
+            if not manager.stop(name):
+                print_error(f"停止服务 '{name}' 失败")
+                success = False
+            else:
+                console.print(f"{Emojis.STOPPED} 服务 '{name}' 已停止", style="stopped")
+        
+        if success:
+            console.print(f"\n{Emojis.STOPPED} 所有服务已成功停止！", style="warning")
+        else:
+            print_warning("有些服务停止失败，请检查日志获取详情。")
+        
+        return success
+    else:
+        result = manager.stop(service_name)
+        if result:
+            console.print(f"{Emojis.STOPPED} 服务 '{service_name}' 已成功停止", style="warning")
+        else:
+            print_error(f"停止服务 '{service_name}' 失败")
+        return result
+
+def handle_restart(manager: ServiceManager, service_name: str) -> bool:
+    """处理重启命令"""
+    if service_name == 'all':
+        service_names = manager.get_service_names()
+        if not service_names:
+            print_warning("配置中没有定义任何服务。")
+            return False
+        
+        console.print(f"{Emojis.RESTART} 正在重启所有服务...", style="restart")
+        success = True
+        for name in service_names:
+            if not manager.restart(name):
+                print_error(f"重启服务 '{name}' 失败")
+                success = False
+            else:
+                console.print(f"{Emojis.RUNNING} 服务 '{name}' 已成功重启", style="restart")
+        
+        if success:
+            print_success("所有服务已成功重启！")
+        else:
+            print_warning("有些服务重启失败，请检查日志获取详情。")
+        
+        return success
+    else:
+        result = manager.restart(service_name)
+        if result:
+            console.print(f"{Emojis.RUNNING} 服务 '{service_name}' 已成功重启", style="restart")
+        else:
+            print_error(f"重启服务 '{service_name}' 失败")
+        return result
+
+def handle_log(manager: ServiceManager, log_manager: LogManager, args) -> bool:
+    """处理日志查看命令"""
+    service_name = args.service
+    follow = not args.no_follow
+    lines = args.lines
+    
+    if service_name == 'all':
+        services = manager.get_service_names()
+        if not services:
+            print_warning("配置中没有定义任何服务。")
+            return False
+    else:
+        if service_name not in manager.get_service_names():
+            print_error(f"服务 '{service_name}' 在配置中未找到。")
+            return False
+        services = [service_name]
+    
+    # 使用LogManager查看日志
+    log_manager.tail_logs(services, follow=follow, lines=lines)
+    return True
+
+def handle_list(manager: ServiceManager) -> bool:
+    """处理列出服务命令"""
+    service_names = manager.get_service_names()
+    
+    if not service_names:
+        print_warning("配置中没有定义任何服务。")
+        return True
+    
+    print_header("服务列表")
+    
+    # 构建服务列表数据
+    services = []
+    for name in service_names:
+        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,
+            "uptime": uptime,
+            "cpu": cpu_mem_stats["cpu"],
+            "memory": cpu_mem_stats["memory"]
+        })
+    
+    # 使用Rich表格显示服务列表
+    print_service_table(services)
+    
+    console.print(f"[dim]配置文件: {manager.config_path}[/]")
+    console.print(f"[dim]运行中服务: {len(manager.get_running_services())}/{len(service_names)}[/]")
+    console.print()
+    
+    return True
+
+def main():
+    """CLI 应用程序入口点"""
+    # 显示头部
+    print_header("SERVLY - Modern Process Manager")
+    
+    parser = setup_arg_parser()
+    args = parser.parse_args()
+    
+    if not args.command:
+        parser.print_help()
+        return 1
+    
+    # 创建服务管理器
+    try:
+        service_manager = ServiceManager(config_path=args.config)
+    except Exception as e:
+        print_error(f"加载配置文件时出错: {escape(str(e))}")
+        return 1
+    
+    # 创建日志管理器
+    log_manager = LogManager(service_manager.log_dir)
+    
+    # 处理命令
+    try:
+        if args.command == 'start':
+            success = handle_start(service_manager, args.service)
+        elif args.command == 'stop':
+            success = handle_stop(service_manager, args.service)
+        elif args.command == 'restart':
+            success = handle_restart(service_manager, args.service)
+        elif args.command == 'log':
+            success = handle_log(service_manager, log_manager, args)
+        elif args.command == 'list':
+            success = handle_list(service_manager)
+        else:
+            parser.print_help()
+            return 1
+    except KeyboardInterrupt:
+        console.print(f"\n{Emojis.STOP} 操作被用户中断", style="dim")
+        return 1
+    except Exception as e:
+        print_error(f"执行命令时出错: {escape(str(e))}")
+        logger.exception("命令执行异常")
+        return 1
+        
+    return 0 if success else 1
+
+if __name__ == "__main__":
+    sys.exit(main())

servly-0.3.1/servly/logs.py

@@ -0,0 +1,233 @@
+"""
+Log management functionality for Servly.
+使用Rich库进行日志格式化和展示，实现PM2风格的日志效果。
+"""
+import os
+import sys
+import time
+import re
+from pathlib import Path
+from typing import List, Dict, Optional, Tuple
+
+from rich.console import Console
+from rich.theme import Theme
+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({
+    "warning": "yellow",
+    "error": "bold red",
+    "info": "green",
+    "dim": "dim",
+    "stdout_service": "green",
+    "stderr_service": "red",
+    "header": "cyan bold",
+    "subheader": "bright_black",
+    "running": "green",
+    "stopped": "bright_black",
+    "restart": "magenta",
+    "separator": "cyan",
+})
+
+# 创建Rich控制台对象
+console = Console(theme=custom_theme)
+
+# 服务相关的 emoji
+class Emojis:
+    """服务状态相关的emoji图标"""
+    SERVICE = "🔧"
+    START = "🟢"
+    STOP = "🔴"
+    RESTART = "🔄"
+    INFO = "ℹ️ "
+    WARNING = "⚠️ "
+    ERROR = "❌"
+    LOG = "📝"
+    STDOUT = "📤"
+    STDERR = "📥"
+    TIME = "🕒"
+    RUNNING = "✅"
+    STOPPED = "⛔"
+    LOADING = "⏳"
+
+# Rich格式化输出工具函数
+def print_header(title: str):
+    """打印美化的标题"""
+    console.print()
+    console.rule(f"[header]{Emojis.SERVICE} {title}[/]", style="separator")
+    console.print()
+
+def print_info(message: str):
+    """打印信息消息"""
+    console.print(f"{Emojis.INFO} {message}", style="info")
+
+def print_warning(message: str):
+    """打印警告消息"""
+    console.print(f"{Emojis.WARNING} {message}", style="warning")
+
+def print_error(message: str):
+    """打印错误消息"""
+    console.print(f"{Emojis.ERROR} {message}", style="error")
+
+def print_success(message: str):
+    """打印成功消息"""
+    console.print(f"{Emojis.RUNNING} {message}", style="running")
+
+def print_service_table(services: List[Dict]):
+    """打印服务状态表格，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"]
+        pid = service["pid"] or "-"
+        uptime = service.get("uptime", "-")
+        cpu = service.get("cpu", "0%")
+        memory = service.get("memory", "0b")
+        
+        status_style = "running" if service["status"] == "running" else "stopped"
+        
+        table.add_row(
+            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)
+    console.print()
+
+
+class LogManager:
+    """管理和显示服务日志"""
+    
+    def __init__(self, log_dir: Path):
+        self.log_dir = log_dir
+        self.default_tail_lines = 15  # 默认展示最后15行日志
+        
+    def get_log_files(self, service_name: str) -> Dict[str, Path]:
+        """获取服务的stdout和stderr日志文件路径"""
+        return {
+            'stdout': self.log_dir / f"{service_name}-out.log",
+            'stderr': self.log_dir / f"{service_name}-error.log"
+        }
+    
+    def _parse_log_line(self, line: str) -> Tuple[str, str]:
+        """解析日志行，提取时间戳和内容"""
+        timestamp = ""
+        content = line.rstrip()
+        
+        # 尝试提取时间戳
+        timestamp_match = re.search(r'(\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2})', line)
+        if timestamp_match:
+            timestamp = timestamp_match.group(1)
+            # 移除行中已有的时间戳部分
+            content = line.replace(timestamp, "", 1).lstrip().rstrip()
+        else:
+            timestamp = time.strftime("%Y-%m-%d %H:%M:%S")
+        
+        return timestamp, content
+    
+    def tail_logs(self, service_names: List[str], follow: bool = True, lines: int = None):
+        """
+        显示服务日志
+        
+        Args:
+            service_names: 要查看的服务名称列表
+            follow: 是否实时跟踪日志（类似tail -f）
+            lines: 初始显示的行数，默认为self.default_tail_lines
+        """
+        if lines is None:
+            lines = self.default_tail_lines
+            
+        if not service_names:
+            print_warning("未指定要查看日志的服务。")
+            return
+
+        # 检查日志文件是否存在
+        log_files = []
+        for service in service_names:
+            service_logs = self.get_log_files(service)
+            for log_type, log_path in service_logs.items():
+                if log_path.exists():
+                    log_files.append((service, log_type, log_path))
+                else:
+                    style = "stderr_service" if log_type == "stderr" else "stdout_service" 
+                    console.print(f"{Emojis.WARNING} 未找到服务 [{style}]{service}[/] 的 {log_type} 日志。", style="warning")
+                    
+        if not log_files:
+            print_warning("未找到指定服务的日志文件。")
+            return
+            
+        if follow:
+            # 首先显示最后几行，然后再开始跟踪
+            self._display_recent_logs(log_files, lines)
+            self._follow_logs(log_files)
+        else:
+            self._display_recent_logs(log_files, lines)
+    
+    def _display_recent_logs(self, log_files: List[Tuple[str, str, Path]], lines: int):
+        """显示最近的日志行"""
+        for service, log_type, log_path in log_files:
+            # PM2风格的标题
+            console.print(f"\n[dim]{log_path} last {lines} lines:[/]")
+            
+            try:
+                # 读取最后N行
+                with open(log_path, 'r') as f:
+                    content = f.readlines()
+                    last_lines = content[-lines:] if len(content) >= lines else content
+                    
+                    # 打印每一行，PM2格式
+                    for line in last_lines:
+                        timestamp, message = self._parse_log_line(line)
+                        style = "stderr_service" if log_type == "stderr" else "stdout_service"
+                        console.print(f"[{style}]{service}[/] | {timestamp}: {message}")
+            except Exception as e:
+                print_error(f"读取日志文件出错: {str(e)}")
+    
+    def _follow_logs(self, log_files: List[Tuple[str, str, Path]]):
+        """实时跟踪日志（类似tail -f）"""
+        file_handlers = {}
+        
+        try:
+            # 打开所有日志文件
+            for service, log_type, log_path in log_files:
+                f = open(log_path, 'r')
+                # 移动到文件末尾
+                f.seek(0, os.SEEK_END)
+                file_handlers[(service, log_type)] = f
+                
+            console.print(f"\n[dim]正在跟踪日志... (按Ctrl+C停止)[/]")
+            
+            while True:
+                has_new_data = False
+                
+                for (service, log_type), f in file_handlers.items():
+                    line = f.readline()
+                    if line:
+                        has_new_data = True
+                        timestamp, message = self._parse_log_line(line)
+                        style = "stderr_service" if log_type == "stderr" else "stdout_service"
+                        console.print(f"[{style}]{service}[/] | {timestamp}: {message}")
+                
+                if not has_new_data:
+                    time.sleep(0.1)
+                    
+        except KeyboardInterrupt:
+            console.print(f"\n[dim]已停止日志跟踪[/]")
+        finally:
+            # 关闭所有文件
+            for f in file_handlers.values():
+                f.close()