servly 0.2.0__tar.gz → 0.3.0__tar.gz

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

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "servly"
-version = "0.2.0"
+version = "0.3.0"
 description = "simple process manager"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -20,6 +20,7 @@ classifiers = [
 ]
 dependencies = [
     "pyyaml>=6.0.2",
+    "rich>=14.0.0",
 ]
 
 [project.scripts]

servly-0.3.0/servly/cli.py

@@ -0,0 +1,270 @@
+#!/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)
+        
+        services.append({
+            "name": name,
+            "status": "running" if is_running else "stopped",
+            "pid": pid
+        })
+    
+    # 使用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.0/servly/logs.py

@@ -0,0 +1,226 @@
+"""
+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
+
+# 自定义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]):
+    """打印服务状态表格"""
+    table = Table(show_header=True, header_style="header", expand=True)
+    table.add_column("名称", style="cyan")
+    table.add_column("状态")
+    table.add_column("PID")
+    
+    for service in services:
+        name = service["name"]
+        status = service["status"]
+        pid = service["pid"] or "-"
+        
+        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()}"
+        
+        table.add_row(
+            name,
+            Text(status_text, style=status_style),
+            Text(str(pid), 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()

{servly-0.2.0 → servly-0.3.0}/servly/service.py

@@ -17,7 +17,9 @@ class ServiceManager:
     
     def __init__(self, config_path: str = "servly.yml", servly_dir: str = ".servly"):
         self.config_path = config_path
-        self.servly_dir = Path(servly_dir)
+        # 修改为使用配置文件所在目录
+        config_dir = os.path.dirname(os.path.abspath(config_path))
+        self.servly_dir = Path(config_dir) / servly_dir
         self.pid_dir = self.servly_dir / "pids"
         self.log_dir = self.servly_dir / "logs"
         self._ensure_dirs()

{servly-0.2.0 → servly-0.3.0}/servly.egg-info/PKG-INFO

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

{servly-0.2.0 → servly-0.3.0}/servly.egg-info/requires.txt

@@ -1 +1,2 @@
 pyyaml>=6.0.2
+rich>=14.0.0

{servly-0.2.0 → servly-0.3.0}/tests/test_advanced.py

@@ -81,6 +81,88 @@ class TestAdvancedFeatures:
         _, kwargs = mock_popen.call_args
         assert 'cwd' in kwargs
         assert kwargs['cwd'] == str(test_dir)
+    
+    @patch('subprocess.Popen')
+    def test_multiline_command(self, mock_popen, temp_dir):
+        """TC4.3: 测试长命令行使用换行符"""
+        # 创建包含多行命令的配置
+        config = {
+            'multiline-cmd': {
+                'cmd': """python -c "
+import sys
+import time
+print('Testing multiline command')
+time.sleep(0.1)
+sys.stdout.flush()
+print('Command executed successfully')
+"
+"""
+            },
+            'multiline-cmd-with-env': {
+                'cmd': """
+                    PYTHONPATH=/path/to/lib \
+                    DEBUG=true \
+                    LOG_LEVEL=debug \
+                    python -m complex_script \
+                        --arg1=value1 \
+                        --arg2=value2 \
+                        --enabled \
+                        --config=/etc/config.json
+                """
+            }
+        }
+        
+        config_path = Path(temp_dir) / 'multiline_cmd_test.yml'
+        with open(config_path, 'w') as f:
+            yaml.dump(config, f)
+        
+        mock_process = MagicMock()
+        mock_process.pid = 12345
+        mock_popen.return_value = mock_process
+        
+        # 创建服务管理器
+        manager = ServiceManager(config_path=config_path)
+        
+        # 启动第一个多行脚本服务
+        result1 = manager.start('multiline-cmd')
+        assert result1 is True
+        
+        # 验证命令是否被正确传递，保留换行符
+        call1_args, call1_kwargs = mock_popen.call_args_list[0]
+        assert call1_kwargs.get('shell') is True, "命令应该以 shell=True 模式执行"
+        cmd1 = call1_args[0]
+        
+        # 验证多行命令中的关键部分
+        assert "import sys" in cmd1
+        assert "import time" in cmd1
+        assert "Testing multiline command" in cmd1
+        
+        # 重置模拟并设置新的返回值
+        mock_popen.reset_mock()
+        mock_process2 = MagicMock()
+        mock_process2.pid = 12346
+        mock_popen.return_value = mock_process2
+        
+        # 启动第二个带环境变量和行连接符的服务
+        result2 = manager.start('multiline-cmd-with-env')
+        assert result2 is True
+        
+        # 验证带续行符的命令是否被正确处理
+        call2_args, call2_kwargs = mock_popen.call_args_list[0]
+        assert call2_kwargs.get('shell') is True, "命令应该以 shell=True 模式执行"
+        cmd2 = call2_args[0]
+        
+        # 验证包含续行符和缩进的命令中的关键部分
+        assert "python -m complex_script" in cmd2
+        assert "--arg1=value1" in cmd2
+        assert "--arg2=value2" in cmd2
+        assert "--enabled" in cmd2
+        assert "--config=/etc/config.json" in cmd2
+        
+        # 验证环境变量是否在命令字符串中
+        assert "PYTHONPATH=/path/to/lib" in cmd2
+        assert "DEBUG=true" in cmd2
+        assert "LOG_LEVEL=debug" in cmd2
 
 class TestErrorHandling:
     """测试错误处理"""

servly-0.2.0/servly/cli.py

@@ -1,295 +0,0 @@
-#!/usr/bin/env python3
-"""
-Command-line interface for Servly process manager.
-"""
-import os
-import sys
-import argparse
-import logging
-from pathlib import Path
-from typing import List, Optional
-
-from servly.service import ServiceManager
-from servly.logs import LogManager
-from servly.logs import Colors, Emojis  # 导入颜色和表情符号定义
-from servly.logs import align_colored_text  # 导入对齐工具函数
-
-# 配置彩色日志记录器
-class ColoredFormatter(logging.Formatter):
-    """添加颜色支持的日志格式化器"""
-    
-    def format(self, record):
-        log_message = super().format(record)
-        
-        if record.levelno >= logging.ERROR:
-            return f"{Emojis.ERROR} {Colors.BRIGHT_RED}{log_message}{Colors.RESET}"
-        elif record.levelno >= logging.WARNING:
-            return f"{Emojis.WARNING} {Colors.YELLOW}{log_message}{Colors.RESET}"
-        elif record.levelno >= logging.INFO:
-            return f"{Emojis.INFO} {Colors.GREEN}{log_message}{Colors.RESET}"
-        else:
-            return f"{Colors.BRIGHT_BLACK}{log_message}{Colors.RESET}"
-
-# 配置日志
-handler = logging.StreamHandler()
-handler.setFormatter(ColoredFormatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s'))
-logger = logging.getLogger('servly')
-logger.setLevel(logging.INFO)
-logger.addHandler(handler)
-
-def print_header():
-    """打印美化的 Servly 头部"""
-    print(f"\n{Colors.CYAN}{Colors.BOLD}{'=' * 50}")
-    print(f"{Emojis.SERVICE} SERVLY {Colors.BRIGHT_BLACK}- Modern Process Manager")
-    print(f"{Colors.CYAN}{'=' * 50}{Colors.RESET}\n")
-
-def setup_arg_parser() -> argparse.ArgumentParser:
-    """设置命令行参数解析器"""
-    parser = argparse.ArgumentParser(
-        description=f"{Colors.CYAN}{Colors.BOLD}{Emojis.SERVICE} Servly - Modern process manager{Colors.RESET}",
-        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(f"{Emojis.WARNING} {Colors.YELLOW}配置中没有定义任何服务。{Colors.RESET}")
-            return False
-        
-        print(f"{Emojis.START} {Colors.BRIGHT_GREEN}正在启动所有服务...{Colors.RESET}")
-        success = True
-        for name in service_names:
-            if not manager.start(name):
-                print(f"{Emojis.ERROR} {Colors.RED}启动服务 '{name}' 失败{Colors.RESET}")
-                success = False
-            else:
-                print(f"{Emojis.RUNNING} {Colors.GREEN}服务 '{name}' 已成功启动{Colors.RESET}")
-        
-        if success:
-            print(f"\n{Emojis.RUNNING} {Colors.BRIGHT_GREEN}所有服务已成功启动！{Colors.RESET}")
-        else:
-            print(f"\n{Emojis.WARNING} {Colors.YELLOW}有些服务启动失败，请检查日志获取详情。{Colors.RESET}")
-        
-        return success
-    else:
-        result = manager.start(service_name)
-        if result:
-            print(f"{Emojis.RUNNING} {Colors.GREEN}服务 '{service_name}' 已成功启动{Colors.RESET}")
-        else:
-            print(f"{Emojis.ERROR} {Colors.RED}启动服务 '{service_name}' 失败{Colors.RESET}")
-        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:
-            print(f"{Emojis.INFO} {Colors.BRIGHT_BLACK}当前没有正在运行的服务。{Colors.RESET}")
-            return True
-        
-        print(f"{Emojis.STOP} {Colors.YELLOW}正在停止所有服务...{Colors.RESET}")
-        success = True
-        for name in service_names:
-            if not manager.stop(name):
-                print(f"{Emojis.ERROR} {Colors.RED}停止服务 '{name}' 失败{Colors.RESET}")
-                success = False
-            else:
-                print(f"{Emojis.STOPPED} {Colors.YELLOW}服务 '{name}' 已停止{Colors.RESET}")
-        
-        if success:
-            print(f"\n{Emojis.STOPPED} {Colors.YELLOW}所有服务已成功停止！{Colors.RESET}")
-        else:
-            print(f"\n{Emojis.WARNING} {Colors.YELLOW}有些服务停止失败，请检查日志获取详情。{Colors.RESET}")
-        
-        return success
-    else:
-        result = manager.stop(service_name)
-        if result:
-            print(f"{Emojis.STOPPED} {Colors.YELLOW}服务 '{service_name}' 已成功停止{Colors.RESET}")
-        else:
-            print(f"{Emojis.ERROR} {Colors.RED}停止服务 '{service_name}' 失败{Colors.RESET}")
-        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(f"{Emojis.WARNING} {Colors.YELLOW}配置中没有定义任何服务。{Colors.RESET}")
-            return False
-        
-        print(f"{Emojis.RESTART} {Colors.MAGENTA}正在重启所有服务...{Colors.RESET}")
-        success = True
-        for name in service_names:
-            if not manager.restart(name):
-                print(f"{Emojis.ERROR} {Colors.RED}重启服务 '{name}' 失败{Colors.RESET}")
-                success = False
-            else:
-                print(f"{Emojis.RUNNING} {Colors.MAGENTA}服务 '{name}' 已成功重启{Colors.RESET}")
-        
-        if success:
-            print(f"\n{Emojis.RUNNING} {Colors.BRIGHT_GREEN}所有服务已成功重启！{Colors.RESET}")
-        else:
-            print(f"\n{Emojis.WARNING} {Colors.YELLOW}有些服务重启失败，请检查日志获取详情。{Colors.RESET}")
-        
-        return success
-    else:
-        result = manager.restart(service_name)
-        if result:
-            print(f"{Emojis.RUNNING} {Colors.MAGENTA}服务 '{service_name}' 已成功重启{Colors.RESET}")
-        else:
-            print(f"{Emojis.ERROR} {Colors.RED}重启服务 '{service_name}' 失败{Colors.RESET}")
-        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(f"{Emojis.WARNING} {Colors.YELLOW}配置中没有定义任何服务。{Colors.RESET}")
-            return False
-    else:
-        if service_name not in manager.get_service_names():
-            print(f"{Emojis.ERROR} {Colors.RED}服务 '{service_name}' 在配置中未找到。{Colors.RESET}")
-            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(f"{Emojis.WARNING} {Colors.YELLOW}配置中没有定义任何服务。{Colors.RESET}")
-        return True
-    
-    # 表头
-    print(f"\n{Colors.CYAN}{Colors.BOLD}{Emojis.SERVICE} 服务列表{Colors.RESET}")
-    print(f"{Colors.CYAN}{'─' * 60}{Colors.RESET}")
-    
-    # 列标题
-    print(f"{Colors.BOLD}{align_colored_text('  名称', 25)} {align_colored_text('状态', 20)} {align_colored_text('PID', 10)}{Colors.RESET}")
-    print(f"{Colors.BRIGHT_BLACK}{'─' * 60}{Colors.RESET}")
-    
-    # 服务列表
-    for name in service_names:
-        is_running = manager.is_running(name)
-        pid = manager.get_service_pid(name) or '-'
-        
-        if is_running:
-            status_text = f"{Emojis.RUNNING} {Colors.GREEN}RUNNING{Colors.RESET}"
-            pid_text = f"{Colors.GREEN}{pid}{Colors.RESET}"
-        else:
-            status_text = f"{Emojis.STOPPED} {Colors.BRIGHT_BLACK}STOPPED{Colors.RESET}"
-            pid_text = f"{Colors.BRIGHT_BLACK}{pid}{Colors.RESET}"
-        
-        # 为不同服务使用不同颜色
-        service_color = Colors.CYAN if is_running else Colors.BRIGHT_BLACK
-        service_text = f"{service_color}{name}{Colors.RESET}"
-        
-        # 使用对齐辅助函数确保正确对齐包含颜色代码的文本
-        aligned_service = align_colored_text(f"  {service_text}", 25)
-        aligned_status = align_colored_text(status_text, 20)
-        aligned_pid = align_colored_text(pid_text, 10)
-        
-        print(f"{aligned_service}{aligned_status}{aligned_pid}")
-    
-    print(f"\n{Colors.BRIGHT_BLACK}配置文件: {manager.config_path}{Colors.RESET}")
-    print(f"{Colors.BRIGHT_BLACK}运行中服务: {len(manager.get_running_services())}/{len(service_names)}{Colors.RESET}")
-    print()
-    
-    return True
-
-def main():
-    """CLI 应用程序入口点"""
-    # 显示头部
-    print_header()
-    
-    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(f"{Emojis.ERROR} {Colors.RED}加载配置文件时出错: {e}{Colors.RESET}")
-        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:
-        print(f"\n{Emojis.STOP} {Colors.BRIGHT_BLACK}操作被用户中断{Colors.RESET}")
-        return 1
-    except Exception as e:
-        print(f"\n{Emojis.ERROR} {Colors.RED}执行命令时出错: {e}{Colors.RESET}")
-        return 1
-        
-    return 0 if success else 1
-
-if __name__ == "__main__":
-    sys.exit(main())

servly-0.2.0/servly/logs.py

@@ -1,266 +0,0 @@
-"""
-Log management functionality for Servly.
-"""
-import os
-import sys
-import time
-import select
-import fcntl
-import termios
-import subprocess
-import re
-from pathlib import Path
-from typing import List, Dict, Optional, Tuple
-import random
-
-
-# ANSI 颜色代码
-class Colors:
-    RESET = "\033[0m"
-    BOLD = "\033[1m"
-    UNDERLINE = "\033[4m"
-    
-    BLACK = "\033[30m"
-    RED = "\033[31m"
-    GREEN = "\033[32m"
-    YELLOW = "\033[33m"
-    BLUE = "\033[34m"
-    MAGENTA = "\033[35m"
-    CYAN = "\033[36m"
-    WHITE = "\033[37m"
-    
-    BRIGHT_BLACK = "\033[90m"
-    BRIGHT_RED = "\033[91m"
-    BRIGHT_GREEN = "\033[92m"
-    BRIGHT_YELLOW = "\033[93m"
-    BRIGHT_BLUE = "\033[94m"
-    BRIGHT_MAGENTA = "\033[95m"
-    BRIGHT_CYAN = "\033[96m"
-    BRIGHT_WHITE = "\033[97m"
-    
-    # 背景色
-    BG_BLACK = "\033[40m"
-    BG_RED = "\033[41m"
-    BG_GREEN = "\033[42m"
-    BG_YELLOW = "\033[43m"
-    BG_BLUE = "\033[44m"
-    BG_MAGENTA = "\033[45m"
-    BG_CYAN = "\033[46m"
-    BG_WHITE = "\033[47m"
-
-
-# 服务相关的 emoji
-class Emojis:
-    SERVICE = "🔧"
-    START = "🟢"
-    STOP = "🔴"
-    RESTART = "🔄"
-    INFO = "ℹ️ "
-    WARNING = "⚠️ "
-    ERROR = "❌"
-    LOG = "📝"
-    STDOUT = "📤"
-    STDERR = "📥"
-    TIME = "🕒"
-    RUNNING = "✅"
-    STOPPED = "⛔"
-    LOADING = "⏳"
-
-
-# 处理彩色文本对齐的辅助函数
-def strip_ansi_codes(text: str) -> str:
-    """删除字符串中的所有 ANSI 转义代码"""
-    ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
-    return ansi_escape.sub('', text)
-
-def get_visible_length(text: str) -> int:
-    """获取文本在终端中的可见长度（排除 ANSI 代码和宽字符）"""
-    text = strip_ansi_codes(text)
-    # 处理中文等宽字符（在大多数终端中占用两个字符宽度）
-    length = 0
-    for char in text:
-        if ord(char) > 127:  # 简单判断是否是非ASCII字符
-            length += 2
-        else:
-            length += 1
-    return length
-
-def align_colored_text(text: str, width: int, align='left') -> str:
-    """
-    将彩色文本对齐到指定宽度
-    
-    Args:
-        text: 可能包含 ANSI 颜色代码的文本
-        width: 期望的显示宽度
-        align: 对齐方式，'left', 'right' 或 'center'
-        
-    Returns:
-        对齐后的文本，保留颜色代码
-    """
-    visible_length = get_visible_length(text)
-    padding = max(0, width - visible_length)
-    
-    if align == 'right':
-        return ' ' * padding + text
-    elif align == 'center':
-        left_padding = padding // 2
-        right_padding = padding - left_padding
-        return ' ' * left_padding + text + ' ' * right_padding
-    else:  # left alignment
-        return text + ' ' * padding
-
-
-class LogManager:
-    """Handles viewing and managing logs for servly services."""
-    
-    def __init__(self, log_dir: Path):
-        self.log_dir = log_dir
-        # 为每个服务分配一个固定颜色，使日志更易读
-        self.service_colors = {}
-        self.available_colors = [
-            Colors.GREEN, Colors.YELLOW, Colors.BLUE, Colors.MAGENTA, Colors.CYAN,
-            Colors.BRIGHT_GREEN, Colors.BRIGHT_YELLOW, Colors.BRIGHT_BLUE, 
-            Colors.BRIGHT_MAGENTA, Colors.BRIGHT_CYAN
-        ]
-        
-    def get_log_files(self, service_name: str) -> Dict[str, Path]:
-        """Get the stdout and stderr log files for a service."""
-        return {
-            'stdout': self.log_dir / f"{service_name}-out.log",
-            'stderr': self.log_dir / f"{service_name}-error.log"
-        }
-    
-    def _get_service_color(self, service_name: str) -> str:
-        """为服务分配一个固定的颜色"""
-        if service_name not in self.service_colors:
-            if not self.available_colors:
-                # 如果颜色用完了，就随机分配
-                self.service_colors[service_name] = random.choice([
-                    Colors.GREEN, Colors.YELLOW, Colors.BLUE, Colors.MAGENTA, Colors.CYAN
-                ])
-            else:
-                # 从可用颜色中选择一个
-                self.service_colors[service_name] = self.available_colors.pop(0)
-        return self.service_colors[service_name]
-    
-    def _format_log_header(self, service: str, log_type: str) -> str:
-        """格式化日志头部，带颜色和 emoji"""
-        service_color = self._get_service_color(service)
-        emoji = Emojis.STDOUT if log_type == 'stdout' else Emojis.STDERR
-        type_color = Colors.GREEN if log_type == 'stdout' else Colors.YELLOW
-        
-        return (f"\n{Colors.BOLD}{Colors.WHITE}{Emojis.LOG} Log Stream: "
-                f"{service_color}{service}{Colors.RESET} "
-                f"{Colors.BRIGHT_BLACK}({type_color}{emoji} {log_type}{Colors.BRIGHT_BLACK}){Colors.RESET}\n"
-                f"{Colors.BRIGHT_BLACK}{'─' * 60}{Colors.RESET}")
-    
-    def _format_log_line(self, service: str, log_type: str, line: str, show_timestamp: bool = True) -> str:
-        """格式化单行日志，带颜色和 emoji"""
-        service_color = self._get_service_color(service)
-        timestamp = time.strftime("%Y-%m-%d %H:%M:%S") if show_timestamp else ""
-        
-        # 根据日志类型选择颜色
-        line_color = Colors.RESET
-        if log_type == 'stderr' and ('error' in line.lower() or 'exception' in line.lower()):
-            prefix = f"{Emojis.ERROR} "
-            line_color = Colors.BRIGHT_RED
-        elif log_type == 'stderr':
-            prefix = f"{Emojis.WARNING} "
-            line_color = Colors.YELLOW
-        else:
-            prefix = f"{Emojis.INFO} "
-        
-        # 格式化输出
-        if show_timestamp:
-            return (f"{Colors.BRIGHT_BLACK}[{Emojis.TIME} {timestamp}]{Colors.RESET} "
-                    f"{service_color}{service}{Colors.RESET} "
-                    f"{prefix}{line_color}{line.rstrip()}{Colors.RESET}")
-        else:
-            return f"{line_color}{line.rstrip()}{Colors.RESET}"
-    
-    def tail_logs(self, service_names: List[str], follow: bool = True, lines: int = 10):
-        """
-        Display logs for specified services in real-time.
-        
-        Args:
-            service_names: List of service names to show logs for
-            follow: Whether to follow logs in real-time (like tail -f)
-            lines: Number of recent lines to display initially
-        """
-        if not service_names:
-            print(f"{Emojis.WARNING} {Colors.YELLOW}No services specified for log viewing.{Colors.RESET}")
-            return
-
-        # Check if the logs exist
-        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:
-                    service_color = self._get_service_color(service)
-                    print(f"{Emojis.WARNING} {Colors.YELLOW}No {log_type} logs found for {service_color}{service}{Colors.RESET}.")
-                    
-        if not log_files:
-            print(f"{Emojis.WARNING} {Colors.YELLOW}No log files found for specified services.{Colors.RESET}")
-            return
-            
-        if follow:
-            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):
-        """Display the most recent lines from log files."""
-        for service, log_type, log_path in log_files:
-            print(self._format_log_header(service, log_type))
-            try:
-                # 读取最后N行
-                with open(log_path, 'r') as f:
-                    content = f.readlines()
-                    last_lines = content[-lines:] if len(content) >= lines else content
-                    
-                    # 打印每一行，增加格式
-                    for line in last_lines:
-                        print(self._format_log_line(service, log_type, line, show_timestamp=False))
-            except Exception as e:
-                print(f"{Emojis.ERROR} {Colors.RED}Error reading logs: {str(e)}{Colors.RESET}")
-    
-    def _follow_logs(self, log_files: List[Tuple[str, str, Path]]):
-        """Follow logs in real-time, similar to tail -f."""
-        # Dictionary to keep track of file positions
-        file_handlers = {}
-        
-        try:
-            # Open all log files
-            for service, log_type, log_path in log_files:
-                f = open(log_path, 'r')
-                # Move to the end of the file
-                f.seek(0, os.SEEK_END)
-                file_handlers[(service, log_type)] = f
-                
-                # 打印日志头部
-                print(self._format_log_header(service, log_type))
-                
-            print(f"\n{Emojis.LOADING} {Colors.BRIGHT_BLACK}Following logs... (Ctrl+C to stop){Colors.RESET}")
-            print(f"{Colors.BRIGHT_BLACK}{'─' * 60}{Colors.RESET}")
-            
-            while True:
-                has_new_data = False
-                
-                for (service, log_type), f in file_handlers.items():
-                    line = f.readline()
-                    if line:
-                        has_new_data = True
-                        print(self._format_log_line(service, log_type, line))
-                
-                if not has_new_data:
-                    time.sleep(0.1)
-                    
-        except KeyboardInterrupt:
-            print(f"\n{Emojis.STOP} {Colors.BRIGHT_BLACK}Stopped following logs.{Colors.RESET}")
-        finally:
-            # Close all file handlers
-            for f in file_handlers.values():
-                f.close()