nginx-lens 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

commands/health.py

@@ -10,14 +10,15 @@ console = Console()
 def health(
     config_path: str = typer.Argument(..., help="Путь к nginx.conf"),
     timeout: float = typer.Option(2.0, help="Таймаут проверки (сек)"),
-    retries: int = typer.Option(1, help="Количество попыток")
+    retries: int = typer.Option(1, help="Количество попыток"),
+    mode: str = typer.Option("tcp", help="Режим проверки: tcp или http", case_sensitive=False),
 ):
     """
     Проверяет доступность upstream-серверов, определённых в nginx.conf. Выводит таблицу.
 
     Пример:
         nginx-lens health /etc/nginx/nginx.conf
-        nginx-lens health /etc/nginx/nginx.conf --timeout 5 --retries 3
+        nginx-lens health /etc/nginx/nginx.conf --timeout 5 --retries 3 --mode http
     """
     try:
         tree = parse_nginx_config(config_path)
@@ -27,14 +28,18 @@ def health(
     except Exception as e:
         console.print(f"[red]Ошибка при разборе {config_path}: {e}[/red]")
         return
+
     upstreams = tree.get_upstreams()
-    results = check_upstreams(upstreams, timeout=timeout, retries=retries)
+    results = check_upstreams(upstreams, timeout=timeout, retries=retries, mode=mode.lower())
+
     table = Table(show_header=True, header_style="bold blue")
     table.add_column("upstream_name")
     table.add_column("upstream_status")
+
     for name, servers in results.items():
         for srv in servers:
             status = "Healthy" if srv["healthy"] else "Unhealthy"
             color = "green" if srv["healthy"] else "red"
             table.add_row(srv["address"], f"[{color}]{status}[/{color}]")
-    console.print(table) 
+
+    console.print(table)

{nginx_lens-0.2.1.dist-info → nginx_lens-0.2.3.dist-info}/METADATA

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

{nginx_lens-0.2.1.dist-info → nginx_lens-0.2.3.dist-info}/RECORD

@@ -15,7 +15,7 @@ commands/analyze.py,sha256=W6begSgXNjgKJGoGeguR3WKgHPLkClWXxxpDcqvsJdc,8343
 commands/cli.py,sha256=9HwDJ-po5al0ceb4Wkyw5F2wzqxbJTo0CbHQ2AQ8obo,722
 commands/diff.py,sha256=C7gRIWh6DNWHzjiQBPVTn-rZ40m2KCY75Zd6Q4URJIE,2076
 commands/graph.py,sha256=xB6KjXBkLmm5gII3e-5BMRGO7WeTwc7EFxRGzYgnme4,5947
-commands/health.py,sha256=SuD2gOeMf9ZaoUfeqx1Nip0xQDBkDus6z872Fhw2Z9w,1682
+commands/health.py,sha256=EV2M2Gt_LnA8WI_0gOBlRYr2u-fxpjq6FBd-tlQOSuI,1830
 commands/include.py,sha256=5PTYG5C00-AlWfIgpQXLq9E7C9yTFSv7HrZkM5ogDps,2224
 commands/logs.py,sha256=RkPUdIpbO9dOVL56lemreYRuAjMjcqqMxRCKOFv2gC4,3691
 commands/route.py,sha256=-x_71u6ENl3iO-oxK3bdE8v5eZKf4xRCydeUyXMFVrY,3163
@@ -25,13 +25,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.2.1.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
+nginx_lens-0.2.3.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=9-6CMUTN7gXUACP8EwX722QogfujZyV-WWWUeM3a79k,455
-nginx_lens-0.2.1.dist-info/METADATA,sha256=SskJ-Jnmu9U0GKY-iQT__GmzxCP3Xl-eVc6yZR61Zr8,520
-nginx_lens-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nginx_lens-0.2.1.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
-nginx_lens-0.2.1.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
-nginx_lens-0.2.1.dist-info/RECORD,,
+upstream_checker/checker.py,sha256=5aTU3-ejUlEOKX9lYxD8PuGTBYyQENwiDknSh168lFE,2336
+nginx_lens-0.2.3.dist-info/METADATA,sha256=ue5Bb9dQNf6RSCxxS7k718glb6-ujAY8yqLlTU7b27w,520
+nginx_lens-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nginx_lens-0.2.3.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
+nginx_lens-0.2.3.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
+nginx_lens-0.2.3.dist-info/RECORD,,

upstream_checker/checker.py

@@ -1,12 +1,79 @@
+# upstream_checker/checker.py
+
 import socket
+import time
+import http.client
 from typing import Dict, List
 
-def check_upstreams(upstreams: Dict[str, List[str]], timeout=2.0, retries=1):
-    # TODO: Реализовать реальную проверку TCP/HTTP
-    # Сейчас возвращает все healthy
-    result = {}
+
+def check_tcp(address: str, timeout: float, retries: int) -> bool:
+    """
+    Проверка доступности сервера по TCP.
+    Ignores extra upstream options like 'max_fails' or 'fail_timeout'.
+    """
+    # Берем только host:port, игнорируем параметры
+    host_port = address.split()[0]
+    host, port = host_port.split(":")
+    port = int(port)
+    
+    for _ in range(retries):
+        try:
+            with socket.create_connection((host, port), timeout=timeout):
+                return True
+        except (socket.timeout, ConnectionRefusedError, OSError):
+            time.sleep(0.2)
+    return False
+
+
+def check_http(address: str, timeout: float, retries: int) -> bool:
+    """
+    Проверка доступности сервера по HTTP (GET /).
+    Ignores extra upstream options like 'max_fails' or 'fail_timeout'.
+    """
+    host_port = address.split()[0]
+    host, port = host_port.split(":")
+    port = int(port)
+    
+    for _ in range(retries):
+        try:
+            conn = http.client.HTTPConnection(host, port, timeout=timeout)
+            conn.request("GET", "/")
+            resp = conn.getresponse()
+            healthy = resp.status < 500
+            conn.close()
+            if healthy:
+                return True
+        except Exception:
+            time.sleep(0.2)
+            continue
+    return False
+
+
+def check_upstreams(
+    upstreams: Dict[str, List[str]],
+    timeout: float = 2.0,
+    retries: int = 1,
+    mode: str = "tcp"
+) -> Dict[str, List[dict]]:
+    """
+    Проверяет доступность upstream-серверов.
+    mode: "tcp" (по умолчанию) или "http"
+    
+    Возвращает:
+    {
+        "backend": [
+            {"address": "127.0.0.1:8080", "healthy": True},
+            ...
+        ]
+    }
+    """
+    results = {}
     for name, servers in upstreams.items():
-        result[name] = []
+        results[name] = []
         for srv in servers:
-            result[name].append({"address": srv, "healthy": True})
-    return result 
+            if mode.lower() == "http":
+                healthy = check_http(srv, timeout, retries)
+            else:
+                healthy = check_tcp(srv, timeout, retries)
+            results[name].append({"address": srv, "healthy": healthy})
+    return results