nginx-lens 0.3.2__py3-none-any.whl → 0.3.3__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
@@ -22,14 +23,16 @@ def health(
         nginx-lens health /etc/nginx/nginx.conf --timeout 5 --retries 3 --mode http
         nginx-lens health /etc/nginx/nginx.conf --resolve
     """
+    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())
@@ -50,6 +53,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 +71,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
@@ -16,19 +17,21 @@ def resolve(
     Пример:
         nginx-lens resolve /etc/nginx/nginx.conf
     """
+    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)
 
@@ -47,10 +50,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.3.dist-info}/METADATA

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

{nginx_lens-0.3.2.dist-info → nginx_lens-0.3.3.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=MIFORCxH9wFH6954h7pmYhbBiqDUVMU6BDHBqWmuSLI,3710
 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=sRsEFgGmqS0WBg9VZBiLXB4KjaiFj8kKRprHYq-f9lI,2383
 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.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=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=tyv6bVjoFdeGFJzASiamj4EoBppqyvM3gGc9aQSzwXo,8271
+nginx_lens-0.3.3.dist-info/METADATA,sha256=EW_qvvG4Qz_ercZXKVX6xVGC4dBVNVvtYuGm41h7ZQ4,552
+nginx_lens-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nginx_lens-0.3.3.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
+nginx_lens-0.3.3.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
+nginx_lens-0.3.3.dist-info/RECORD,,

upstream_checker/checker.py

@@ -80,14 +80,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 +94,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 +108,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 +137,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 +152,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 +171,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: