nginx-lens 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

commands/graph.py

@@ -16,7 +16,14 @@ def graph(
     Пример:
         nginx-lens graph /etc/nginx/nginx.conf
     """
-    tree = parse_nginx_config(config_path)
+    try:
+        tree = parse_nginx_config(config_path)
+    except FileNotFoundError:
+        console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
+        return
+    except Exception as e:
+        console.print(f"[red]Ошибка при разборе {config_path}: {e}[/red]")
+        return
     routes = []
     # Для каждого server/location строим маршрут
     def walk(d, chain, upstreams):

commands/health.py

@@ -19,7 +19,14 @@ def health(
         nginx-lens health /etc/nginx/nginx.conf
         nginx-lens health /etc/nginx/nginx.conf --timeout 5 --retries 3
     """
-    tree = parse_nginx_config(config_path)
+    try:
+        tree = parse_nginx_config(config_path)
+    except FileNotFoundError:
+        console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
+        return
+    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)
     table = Table(show_header=True, header_style="bold blue")

commands/logs.py

@@ -26,28 +26,36 @@ def logs(
     Пример:
         nginx-lens logs /var/log/nginx/access.log --top 20
     """
+    try:
+        with open(log_path) as f:
+            lines = list(f)
+    except FileNotFoundError:
+        console.print(f"[red]Файл {log_path} не найден. Проверьте путь к логу.[/red]")
+        return
+    except Exception as e:
+        console.print(f"[red]Ошибка при чтении {log_path}: {e}[/red]")
+        return
     status_counter = Counter()
     path_counter = Counter()
     ip_counter = Counter()
     user_agent_counter = Counter()
     errors = defaultdict(list)
-    with open(log_path) as f:
-        for line in f:
-            m = log_line_re.search(line)
-            if m:
-                ip = m.group('ip')
-                path = m.group('path')
-                status = m.group('status')
-                status_counter[status] += 1
-                path_counter[path] += 1
-                ip_counter[ip] += 1
-                if status.startswith('4') or status.startswith('5'):
-                    errors[status].append(path)
-            # user-agent (если есть)
-            if '" "' in line:
-                ua = line.rsplit('" "', 1)[-1].strip().strip('"')
-                if ua:
-                    user_agent_counter[ua] += 1
+    for line in lines:
+        m = log_line_re.search(line)
+        if m:
+            ip = m.group('ip')
+            path = m.group('path')
+            status = m.group('status')
+            status_counter[status] += 1
+            path_counter[path] += 1
+            ip_counter[ip] += 1
+            if status.startswith('4') or status.startswith('5'):
+                errors[status].append(path)
+        # user-agent (если есть)
+        if '" "' in line:
+            ua = line.rsplit('" "', 1)[-1].strip().strip('"')
+            if ua:
+                user_agent_counter[ua] += 1
     # Топ статусов
     table = Table(title="Top HTTP Status Codes", show_header=True, header_style="bold blue")
     table.add_column("Status")

commands/route.py

@@ -6,19 +6,22 @@ from parser.nginx_parser import parse_nginx_config
 import glob
 import os
 
-app = typer.Typer()
+app = typer.Typer(help="Показывает, какой server/location обслуживает указанный URL. По умолчанию ищет во всех .conf в /etc/nginx/. Для кастомного пути используйте -c/--config.")
 console = Console()
 
 def route(
-    config_path: str = typer.Argument(None, help="Путь к nginx.conf (если не указан — поиск по всем .conf в /etc/nginx)", show_default=False),
-    url: str = typer.Argument(..., help="URL для маршрутизации (например, http://host/path)")
+    url: str = typer.Argument(..., help="URL для маршрутизации (например, http://host/path)"),
+    config_path: str = typer.Option(None, "-c", "--config", help="Путь к кастомному nginx.conf (если не указан — поиск по всем .conf в /etc/nginx)")
 ):
     """
     Показывает, какой server/location обслуживает указанный URL.
 
-    Пример:
-        nginx-lens route /etc/nginx/nginx.conf http://example.com/api/v1
+    По умолчанию ищет во всех .conf в /etc/nginx/.
+    Для кастомного пути используйте опцию -c/--config.
+
+    Примеры:
         nginx-lens route http://example.com/api/v1
+        nginx-lens route -c /etc/nginx/nginx.conf http://example.com/api/v1
     """
     configs = []
     if config_path:

commands/syntax.py

@@ -37,6 +37,8 @@ def syntax(
         console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
         return
     cmd = [nginx_path, "-t", "-c", os.path.abspath(config_path)]
+    if hasattr(os, 'geteuid') and os.geteuid() != 0:
+        cmd = ["sudo"] + cmd
     try:
         result = subprocess.run(cmd, capture_output=True, text=True, check=False)
         if result.returncode == 0:

{nginx_lens-0.1.6.dist-info → nginx_lens-0.1.7.dist-info}/METADATA

@@ -1,15 +1,17 @@
 Metadata-Version: 2.4
 Name: nginx-lens
-Version: 0.1.6
+Version: 0.1.7
 Summary: CLI-инструмент для анализа, визуализации и диагностики конфигураций Nginx
 Author: Daniil Astrouski
 Author-email: shelovesuastra@gmail.com
 Requires-Python: >=3.8
+License-File: LICENSE
 Requires-Dist: typer[all]>=0.9.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: requests>=2.25.0
 Dynamic: author
 Dynamic: author-email
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{nginx_lens-0.1.6.dist-info → nginx_lens-0.1.7.dist-info}/RECORD

@@ -14,23 +14,24 @@ commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 commands/analyze.py,sha256=W6begSgXNjgKJGoGeguR3WKgHPLkClWXxxpDcqvsJdc,8343
 commands/cli.py,sha256=9HwDJ-po5al0ceb4Wkyw5F2wzqxbJTo0CbHQ2AQ8obo,722
 commands/diff.py,sha256=C7gRIWh6DNWHzjiQBPVTn-rZ40m2KCY75Zd6Q4URJIE,2076
-commands/graph.py,sha256=fvYDUvj_BXdIAm8eg52v5VxhkZijb2YDkCw7D21ZK-M,4650
-commands/health.py,sha256=d2bBui0qauQtO4Ll9cjniKR1Y5dYJBQzG9CECDnsUQ4,1365
+commands/graph.py,sha256=8CnpKqVx9yUpDMcjDX-kN_SqUrS9dFqCUTrsalm-iMg,4967
+commands/health.py,sha256=SuD2gOeMf9ZaoUfeqx1Nip0xQDBkDus6z872Fhw2Z9w,1682
 commands/include.py,sha256=5PTYG5C00-AlWfIgpQXLq9E7C9yTFSv7HrZkM5ogDps,2224
-commands/logs.py,sha256=8tnGsgNy_B97S3O0D_6bvOVfNvAyqeUNotlDOdjltgw,3420
-commands/route.py,sha256=H_xMk9KoqwesutzT9ewiTsakfdjmu01kka9ZQc14faY,2222
-commands/syntax.py,sha256=gABzFvml92bHqYa6YdRx78bmrtd9v2ORT_Hz-gfQu1U,3336
+commands/logs.py,sha256=RkPUdIpbO9dOVL56lemreYRuAjMjcqqMxRCKOFv2gC4,3691
+commands/route.py,sha256=DfevWTwJfup1Ifmd99pYeuRteFNaldkAvISV8hC5a-c,2650
+commands/syntax.py,sha256=ZWFdaL8LVv9S694wlk2aV3HJKb0OSKjw3wNgTlNvFR8,3418
 commands/tree.py,sha256=mDfx0Aeg1EDQSYQoJ2nJIkSd_uP7ZR7pEqy7Cw3clQ0,2161
 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.1.7.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
 parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 parser/nginx_parser.py,sha256=JqZ3clNy4Nf-bmbsx_rJUL7EgRoB79b87eEu_isMeqg,3577
 upstream_checker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 upstream_checker/checker.py,sha256=9-6CMUTN7gXUACP8EwX722QogfujZyV-WWWUeM3a79k,455
-nginx_lens-0.1.6.dist-info/METADATA,sha256=FhO8QQOa9YfJzMUtNq313YcaNQAhHr2UEMNHXDIJkBU,476
-nginx_lens-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nginx_lens-0.1.6.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
-nginx_lens-0.1.6.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
-nginx_lens-0.1.6.dist-info/RECORD,,
+nginx_lens-0.1.7.dist-info/METADATA,sha256=eN2OiSpnQpDN8kRzVdynuAwJamWiMme1UlIr-cXvfC4,520
+nginx_lens-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nginx_lens-0.1.7.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
+nginx_lens-0.1.7.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
+nginx_lens-0.1.7.dist-info/RECORD,,

nginx_lens-0.1.7.dist-info/licenses/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Daniil Astrouski
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.