nginx-lens 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

commands/health.py

@@ -1,3 +1,4 @@
+import sys
 import typer
 from rich.console import Console
 from rich.table import Table
@@ -13,31 +14,36 @@ def health(
     retries: int = typer.Option(1, help="Количество попыток"),
     mode: str = typer.Option("tcp", help="Режим проверки: tcp или http", case_sensitive=False),
     resolve: bool = typer.Option(False, "--resolve", "-r", help="Показать резолвленные IP-адреса"),
+    max_workers: int = typer.Option(10, "--max-workers", "-w", help="Максимальное количество потоков для параллельной обработки"),
 ):
     """
     Проверяет доступность upstream-серверов, определённых в nginx.conf. Выводит таблицу.
+    Использует параллельную обработку для ускорения проверки множества upstream серверов.
 
     Пример:
         nginx-lens health /etc/nginx/nginx.conf
         nginx-lens health /etc/nginx/nginx.conf --timeout 5 --retries 3 --mode http
         nginx-lens health /etc/nginx/nginx.conf --resolve
+        nginx-lens health /etc/nginx/nginx.conf --max-workers 20
     """
+    exit_code = 0
+    
     try:
         tree = parse_nginx_config(config_path)
     except FileNotFoundError:
         console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
-        return
+        sys.exit(1)
     except Exception as e:
         console.print(f"[red]Ошибка при разборе {config_path}: {e}[/red]")
-        return
+        sys.exit(1)
 
     upstreams = tree.get_upstreams()
-    results = check_upstreams(upstreams, timeout=timeout, retries=retries, mode=mode.lower())
+    results = check_upstreams(upstreams, timeout=timeout, retries=retries, mode=mode.lower(), max_workers=max_workers)
     
     # Если нужно показать резолвленные IP-адреса
     resolved_info = {}
     if resolve:
-        resolved_info = resolve_upstreams(upstreams)
+        resolved_info = resolve_upstreams(upstreams, max_workers=max_workers)
 
     table = Table(show_header=True, header_style="bold blue")
     table.add_column("Address")
@@ -50,6 +56,10 @@ def health(
             status = "Healthy" if srv["healthy"] else "Unhealthy"
             color = "green" if srv["healthy"] else "red"
             
+            # Проверяем статус здоровья
+            if not srv["healthy"]:
+                exit_code = 1
+            
             if resolve:
                 resolved_list = []
                 if name in resolved_info:
@@ -64,11 +74,14 @@ def health(
                     # Если есть "invalid resolve", показываем красным, иначе зеленым
                     if any("invalid resolve" in r for r in resolved_list):
                         table.add_row(srv["address"], f"[{color}]{status}[/{color}]", f"[red]{resolved_str}[/red]")
+                        exit_code = 1
                     else:
                         table.add_row(srv["address"], f"[{color}]{status}[/{color}]", f"[green]{resolved_str}[/green]")
                 else:
                     table.add_row(srv["address"], f"[{color}]{status}[/{color}]", "[yellow]Failed to resolve[/yellow]")
+                    exit_code = 1
             else:
                 table.add_row(srv["address"], f"[{color}]{status}[/{color}]")
 
     console.print(table)
+    sys.exit(exit_code)

commands/resolve.py

@@ -1,3 +1,4 @@
+import sys
 import typer
 from rich.console import Console
 from rich.table import Table
@@ -9,28 +10,33 @@ console = Console()
 
 def resolve(
     config_path: str = typer.Argument(..., help="Путь к nginx.conf"),
+    max_workers: int = typer.Option(10, "--max-workers", "-w", help="Максимальное количество потоков для параллельной обработки"),
 ):
     """
     Резолвит DNS имена upstream-серверов в IP-адреса.
+    Использует параллельную обработку для ускорения резолвинга множества upstream серверов.
 
     Пример:
         nginx-lens resolve /etc/nginx/nginx.conf
+        nginx-lens resolve /etc/nginx/nginx.conf --max-workers 20
     """
+    exit_code = 0
+    
     try:
         tree = parse_nginx_config(config_path)
     except FileNotFoundError:
         console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
-        return
+        sys.exit(1)
     except Exception as e:
         console.print(f"[red]Ошибка при разборе {config_path}: {e}[/red]")
-        return
+        sys.exit(1)
 
     upstreams = tree.get_upstreams()
     if not upstreams:
         console.print("[yellow]Не найдено ни одного upstream в конфигурации.[/yellow]")
-        return
+        sys.exit(0)  # Нет upstream - это не ошибка, просто нет чего проверять
     
-    results = resolve_upstreams(upstreams)
+    results = resolve_upstreams(upstreams, max_workers=max_workers)
 
     table = Table(show_header=True, header_style="bold blue")
     table.add_column("Upstream Name")
@@ -47,10 +53,13 @@ def resolve(
                 # Если есть "invalid resolve", показываем красным, иначе зеленым
                 if any("invalid resolve" in r for r in resolved_list):
                     table.add_row(upstream_name, srv["address"], f"[red]{resolved_str}[/red]")
+                    exit_code = 1
                 else:
                     table.add_row(upstream_name, srv["address"], f"[green]{resolved_str}[/green]")
             else:
                 table.add_row(upstream_name, srv["address"], "[red]Failed to resolve[/red]")
+                exit_code = 1
 
     console.print(table)
+    sys.exit(exit_code)
 

{nginx_lens-0.3.2.dist-info → nginx_lens-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nginx-lens
-Version: 0.3.2
+Version: 0.3.4
 Summary: CLI-инструмент для анализа, визуализации и диагностики конфигураций Nginx
 Author: Daniil Astrouski
 Author-email: shelovesuastra@gmail.com

{nginx_lens-0.3.2.dist-info → nginx_lens-0.3.4.dist-info}/RECORD

@@ -15,10 +15,10 @@ commands/analyze.py,sha256=W6begSgXNjgKJGoGeguR3WKgHPLkClWXxxpDcqvsJdc,8343
 commands/cli.py,sha256=brzp6xDDWIrm7ibaoT4x94hgAdBB2DVWniXoK8dRylE,782
 commands/diff.py,sha256=C7gRIWh6DNWHzjiQBPVTn-rZ40m2KCY75Zd6Q4URJIE,2076
 commands/graph.py,sha256=xB6KjXBkLmm5gII3e-5BMRGO7WeTwc7EFxRGzYgnme4,5947
-commands/health.py,sha256=JAlUKx2kXhi2eigSQXG7GxuQMPydYzojgV2qaRcoLWw,3429
+commands/health.py,sha256=lxrvuD-ClMLpTJ7gs7kn50fXwA4uBlHMPWA1ZxdEtAE,4167
 commands/include.py,sha256=5PTYG5C00-AlWfIgpQXLq9E7C9yTFSv7HrZkM5ogDps,2224
 commands/logs.py,sha256=RkPUdIpbO9dOVL56lemreYRuAjMjcqqMxRCKOFv2gC4,3691
-commands/resolve.py,sha256=LVfp-cva-XlKOOIS5Da908mBGgjq1DtZlsahMUylAsk,2151
+commands/resolve.py,sha256=MRruIH46tIelUyyrdrF70ai-tluuEJ13Jcj2nyRCSPA,2820
 commands/route.py,sha256=-x_71u6ENl3iO-oxK3bdE8v5eZKf4xRCydeUyXMFVrY,3163
 commands/syntax.py,sha256=ZWFdaL8LVv9S694wlk2aV3HJKb0OSKjw3wNgTlNvFR8,3418
 commands/tree.py,sha256=mDfx0Aeg1EDQSYQoJ2nJIkSd_uP7ZR7pEqy7Cw3clQ0,2161
@@ -26,13 +26,13 @@ exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 exporter/graph.py,sha256=WYUrqUgCaK6KihgxAcRHaQn4oMo6b7ybC8yb_36ZIsA,3995
 exporter/html.py,sha256=uquEM-WvBt2aV9GshgaI3UVhYd8sD0QQ-OmuNtvYUdU,798
 exporter/markdown.py,sha256=_0mXQIhurGEZ0dO-eq9DbsuKNrgEDIblgtL3DAgYNo8,724
-nginx_lens-0.3.2.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
+nginx_lens-0.3.4.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
 parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 parser/nginx_parser.py,sha256=Sa9FtGAkvTqNzoehBvgLUWPJHLLIZYWH9ugSHW50X8s,3699
 upstream_checker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-upstream_checker/checker.py,sha256=ZwAlIW6yh0OVdeI44dpZUeSUbByE04gBxTUsRMRUgU8,9496
-nginx_lens-0.3.2.dist-info/METADATA,sha256=DanBz8o77g84wsKtgPzMKCa2IrX8VVrq78DOFuJeTdA,552
-nginx_lens-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nginx_lens-0.3.2.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
-nginx_lens-0.3.2.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
-nginx_lens-0.3.2.dist-info/RECORD,,
+upstream_checker/checker.py,sha256=i3L6XqUHUH5hcyLq5PXx6wOyjzEL_Z7xYCA3FffFOrU,11257
+nginx_lens-0.3.4.dist-info/METADATA,sha256=E7ce-3zNXvNVp7-y_TvlnmtCTIjMhid2sdqzbrpgy8U,552
+nginx_lens-0.3.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+nginx_lens-0.3.4.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
+nginx_lens-0.3.4.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
+nginx_lens-0.3.4.dist-info/RECORD,,

{nginx_lens-0.3.2.dist-info → nginx_lens-0.3.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

upstream_checker/checker.py

@@ -3,7 +3,8 @@
 import socket
 import time
 import http.client
-from typing import Dict, List
+from typing import Dict, List, Tuple
+from concurrent.futures import ThreadPoolExecutor, as_completed
 try:
     import dns.resolver
     import dns.exception
@@ -80,14 +81,12 @@ def resolve_address(address: str) -> List[str]:
             return []
         host, port = parts
         
-        # Если это уже IPv4 адрес, возвращаем как есть
         try:
             socket.inet_aton(host)
             return [host_port]
         except socket.error:
             pass
         
-        # Проверяем IPv6 (в квадратных скобках)
         if host.startswith("[") and host.endswith("]"):
             ipv6_host = host[1:-1]
             try:
@@ -96,11 +95,9 @@ def resolve_address(address: str) -> List[str]:
             except (socket.error, OSError):
                 pass
         
-        # Используем dnspython для детального DNS резолвинга
         if DNS_AVAILABLE:
             return _resolve_with_dns(host, port)
         else:
-            # Fallback на стандартный socket, если dnspython недоступен
             return _resolve_with_socket(host, port)
     except (ValueError, IndexError, AttributeError):
         return []
@@ -112,25 +109,21 @@ def _resolve_with_dns(host: str, port: str) -> List[str]:
         cname_info = None
         invalid_type = None
         
-        # Сначала проверяем CNAME для исходного хоста
         try:
             cname_answer = dns.resolver.resolve(host, 'CNAME', raise_on_no_answer=False)
             if cname_answer:
                 cname_target = str(cname_answer[0].target).rstrip('.')
                 cname_info = cname_target
                 
-                # Если есть CNAME, проверяем A записи для CNAME цели (не для исходного хоста)
                 try:
                     a_answer = dns.resolver.resolve(cname_target, 'A', raise_on_no_answer=False)
                     if a_answer:
-                        # CNAME ведет на валидные A записи
                         resolved_ips = []
                         for rdata in a_answer:
                             ip = str(rdata.address)
                             resolved_ips.append(f"{ip}:{port} (via {cname_info})")
                         return resolved_ips
                     else:
-                        # Нет A записей для CNAME цели, проверяем другие типы
                         try:
                             txt_answer = dns.resolver.resolve(cname_target, 'TXT', raise_on_no_answer=False)
                             if txt_answer:
@@ -145,7 +138,6 @@ def _resolve_with_dns(host: str, port: str) -> List[str]:
                             except:
                                 pass
                         if not invalid_type:
-                            # Проверяем другие невалидные типы
                             try:
                                 ns_answer = dns.resolver.resolve(cname_target, 'NS', raise_on_no_answer=False)
                                 if ns_answer:
@@ -161,7 +153,6 @@ def _resolve_with_dns(host: str, port: str) -> List[str]:
         except Exception:
             pass
         
-        # Если нет CNAME, получаем A записи для исходного хоста
         try:
             a_answer = dns.resolver.resolve(host, 'A', raise_on_no_answer=False)
             if a_answer:
@@ -181,13 +172,10 @@ def _resolve_with_dns(host: str, port: str) -> List[str]:
 def _resolve_with_socket(host: str, port: str) -> List[str]:
     """Fallback резолвинг через socket (без информации о CNAME)."""
     try:
-        # gethostbyname_ex возвращает (hostname, aliaslist, ipaddrlist)
         _, _, ipaddrlist = socket.gethostbyname_ex(host)
-        # Фильтруем только IPv4 адреса (IPv6 обрабатываются отдельно)
         resolved_ips = []
         for ip in ipaddrlist:
             try:
-                # Проверяем, что это IPv4
                 socket.inet_aton(ip)
                 resolved_ips.append(f"{ip}:{port}")
             except socket.error:
@@ -198,11 +186,16 @@ def _resolve_with_socket(host: str, port: str) -> List[str]:
 
 
 def resolve_upstreams(
-    upstreams: Dict[str, List[str]]
+    upstreams: Dict[str, List[str]],
+    max_workers: int = 10
 ) -> Dict[str, List[dict]]:
     """
     Резолвит DNS имена upstream-серверов в IP-адреса.
     
+    Args:
+        upstreams: Словарь upstream серверов
+        max_workers: Максимальное количество потоков для параллельной обработки
+    
     Возвращает:
     {
         "backend": [
@@ -213,27 +206,71 @@ def resolve_upstreams(
         ]
     }
     """
-    results = {}
+    # Собираем все задачи для параллельной обработки
+    tasks = []
+    task_to_key = {}
+    
     for name, servers in upstreams.items():
-        results[name] = []
-        for srv in servers:
-            resolved = resolve_address(srv)
-            results[name].append({
-                "address": srv,
-                "resolved": resolved
-            })
+        for idx, srv in enumerate(servers):
+            key = (name, idx, srv)
+            tasks.append((key, srv))
+            task_to_key[key] = (name, idx)
+    
+    results = {}
+    for name in upstreams.keys():
+        results[name] = [None] * len(upstreams[name])
+    
+    # Если нет задач, возвращаем пустой результат
+    if not tasks:
+        return results
+    
+    # Параллельная обработка резолвинга
+    with ThreadPoolExecutor(max_workers=max_workers) as executor:
+        future_to_key = {executor.submit(resolve_address, srv): key for key, srv in tasks}
+        
+        for future in as_completed(future_to_key):
+            key = future_to_key[future]
+            name, idx = task_to_key[key]
+            try:
+                resolved = future.result()
+                results[name][idx] = {
+                    "address": key[2],
+                    "resolved": resolved
+                }
+            except Exception:
+                results[name][idx] = {
+                    "address": key[2],
+                    "resolved": []
+                }
+    
     return results
 
 
+def _check_single_upstream(srv: str, timeout: float, retries: int, mode: str) -> Tuple[str, bool]:
+    """Вспомогательная функция для проверки одного upstream сервера."""
+    if mode.lower() == "http":
+        healthy = check_http(srv, timeout, retries)
+    else:
+        healthy = check_tcp(srv, timeout, retries)
+    return (srv, healthy)
+
+
 def check_upstreams(
     upstreams: Dict[str, List[str]],
     timeout: float = 2.0,
     retries: int = 1,
-    mode: str = "tcp"
+    mode: str = "tcp",
+    max_workers: int = 10
 ) -> Dict[str, List[dict]]:
     """
     Проверяет доступность upstream-серверов.
-    mode: "tcp" (по умолчанию) или "http"
+    
+    Args:
+        upstreams: Словарь upstream серверов
+        timeout: Таймаут проверки (сек)
+        retries: Количество попыток
+        mode: "tcp" (по умолчанию) или "http"
+        max_workers: Максимальное количество потоков для параллельной обработки
     
     Возвращает:
     {
@@ -243,13 +280,38 @@ def check_upstreams(
         ]
     }
     """
-    results = {}
+    # Собираем все задачи для параллельной обработки
+    tasks = []
+    task_to_key = {}
+    
     for name, servers in upstreams.items():
-        results[name] = []
-        for srv in servers:
-            if mode.lower() == "http":
-                healthy = check_http(srv, timeout, retries)
-            else:
-                healthy = check_tcp(srv, timeout, retries)
-            results[name].append({"address": srv, "healthy": healthy})
+        for idx, srv in enumerate(servers):
+            key = (name, idx, srv)
+            tasks.append((key, srv))
+            task_to_key[key] = (name, idx)
+    
+    results = {}
+    for name in upstreams.keys():
+        results[name] = [None] * len(upstreams[name])
+    
+    # Если нет задач, возвращаем пустой результат
+    if not tasks:
+        return results
+    
+    # Параллельная обработка проверок
+    with ThreadPoolExecutor(max_workers=max_workers) as executor:
+        future_to_key = {
+            executor.submit(_check_single_upstream, srv, timeout, retries, mode): key 
+            for key, srv in tasks
+        }
+        
+        for future in as_completed(future_to_key):
+            key = future_to_key[future]
+            name, idx = task_to_key[key]
+            try:
+                srv, healthy = future.result()
+                results[name][idx] = {"address": srv, "healthy": healthy}
+            except Exception:
+                results[name][idx] = {"address": key[2], "healthy": False}
+    
     return results