omserv 0.0.0.dev102__tar.gz → 0.0.0.dev104__tar.gz

{omserv-0.0.0.dev102/omserv.egg-info → omserv-0.0.0.dev104}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev102
+Version: 0.0.0.dev104
 Summary: omserv
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev102
+Requires-Dist: omlish==0.0.0.dev104
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

omserv-0.0.0.dev104/omserv/.manifests.json

@@ -0,0 +1,14 @@
+[
+  {
+    "module": ".nginx.logs",
+    "attr": "_CLI_MODULE",
+    "file": "omserv/nginx/logs.py",
+    "line": 65,
+    "value": {
+      "$omdev.cli.types.CliModule": {
+        "cmd_name": "nginxlogs",
+        "mod_name": "omserv.nginx.logs"
+      }
+    }
+  }
+]

omserv-0.0.0.dev104/omserv/nginx/logs.py

@@ -0,0 +1,94 @@
+"""
+'54.244.199.9',
+'-',
+'-',
+'[20/Jul/2024:17:54:01 +0000]',
+'"GET /profile/jenkinsFile HTTP/1.1"',
+'404',
+'555',
+'"-"',
+'"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36"',
+
+==
+
+remote_addr
+-
+remote_user
+[time_local]
+"request"
+status
+body_bytes_sent
+"http_referer"
+"http_user_agent"
+"""  # noqa
+import itertools
+import json
+import re
+import typing as ta
+
+
+NGINX_LOG_PAT = re.compile(r'(\[[^\]]*\])|("[^"]*")|([^ ]+)')
+
+NGINX_LOG_COLUMNS: ta.Sequence[str] = [
+    'remote_addr',
+    '-',
+    'remote_user',
+    'time_local',
+    'request',
+    'status',
+    'body_bytes_sent',
+    'http_referer',
+    'http_user_agent',
+]
+
+
+def parse_nginx_log_line(
+        line: str,
+        *,
+        columns: ta.Sequence[str] = NGINX_LOG_COLUMNS,
+        pattern: re.Pattern = NGINX_LOG_PAT,
+        num_groups: int = 4,
+) -> dict[str, ta.Any]:
+    if isinstance(columns, str):
+        raise TypeError(columns)
+
+    vs = []
+    for t in itertools.batched(pattern.split(line.strip()), num_groups):
+        if len(t) < 2:
+            continue
+        [v] = filter(None, t[1:])
+        vs.append(v)
+
+    return dict(zip(columns, vs, strict=True))
+
+
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'nginxlogs',
+    'mod_name': __name__,
+}}
+
+
+def _main() -> None:
+    import argparse
+    import contextlib
+    import sys
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument('file', nargs='?')
+    args = parser.parse_args()
+
+    with contextlib.ExitStack() as es:
+        f: ta.TextIO
+        if args.file:
+            f = es.enter_context(open(args.file))
+        else:
+            f = sys.stdin
+
+        for line in f:
+            d = parse_nginx_log_line(line)
+            print(json.dumps(d))
+
+
+if __name__ == '__main__':
+    _main()

{omserv-0.0.0.dev102 → omserv-0.0.0.dev104/omserv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev102
+Version: 0.0.0.dev104
 Summary: omserv
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev102
+Requires-Dist: omlish==0.0.0.dev104
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

{omserv-0.0.0.dev102 → omserv-0.0.0.dev104}/omserv.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ omserv/apps/templates.py
 omserv/nginx/__init__.py
 omserv/nginx/build.py
 omserv/nginx/configs.py
+omserv/nginx/logs.py
 omserv/nginx/stubstatus.py
 omserv/nginx/patches/__init__.py
 omserv/nginx/patches/nginx-1.27.1_http_status.patch

{omserv-0.0.0.dev102 → omserv-0.0.0.dev104}/omserv.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev102
+omlish==0.0.0.dev104
 
 [all]
 h11~=0.14

{omserv-0.0.0.dev102 → omserv-0.0.0.dev104}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev102'
+version = '0.0.0.dev104'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omserv'
 dependencies = [
-    'omlish == 0.0.0.dev102',
+    'omlish == 0.0.0.dev104',
 ]
 
 [project.optional-dependencies]

omserv-0.0.0.dev102/omserv/.manifests.json

@@ -1 +0,0 @@
-[]