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

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

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

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

@@ -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.2.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=_GiiNNO1U2CoFKmJP7rWwvCdyxsgB4keSS9y4IrSeEc,1961
-nginx_lens-0.2.2.dist-info/METADATA,sha256=wyn9pvzpCJVnmjcdQjtE04udvjc9NOqZ_pWfx7BQGh8,520
-nginx_lens-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nginx_lens-0.2.2.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
-nginx_lens-0.2.2.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
-nginx_lens-0.2.2.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

@@ -7,9 +7,15 @@ from typing import Dict, List
 
 
 def check_tcp(address: str, timeout: float, retries: int) -> bool:
-    """Проверка доступности сервера по TCP"""
-    host, port = address.split(":")
+    """
+    Проверка доступности сервера по 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):
@@ -20,9 +26,14 @@ def check_tcp(address: str, timeout: float, retries: int) -> bool:
 
 
 def check_http(address: str, timeout: float, retries: int) -> bool:
-    """Проверка доступности сервера по HTTP (GET /)"""
-    host, port = address.split(":")
+    """
+    Проверка доступности сервера по 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)
@@ -38,10 +49,16 @@ def check_http(address: str, timeout: float, retries: int) -> bool:
     return False
 
 
-def check_upstreams(upstreams: Dict[str, List[str]], timeout=2.0, retries=1, mode="tcp") -> Dict[str, List[dict]]:
+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": [