light9 Changeset - 891c380afcc1

Changeset - 891c380afcc1

Parent rev.

Child rev.

[Not reviewed]

default

1 1 2

drewp@bigasterisk.com - 20 months ago 2023-05-19 20:59:07
drewp@bigasterisk.com

move py code under light9, add import test

3 files changed with 65 insertions and 52 deletions:

bin/homepage

light9/homepage/write_config.py

light9/homepage/write_config_test.py

0 comments (0 inline, 0 general)

bin/homepage

➞

Show inline comments

 #!/bin/zsh
 CONF=/tmp/light9_nginx.conf
 ROOT=`dirname $0`/..
 ROOT=${ROOT:a}
-bin/homepageConfig > /tmp/light9_nginx_routes.conf && \
+bin/python light9/homepage/write_config.py /tmp/light9_nginx_routes.conf && \
 cat > $CONF <<EOF
 worker_processes 1;
 daemon off;
 error_log /tmp/light9_homepage.err;
 pid /dev/null;
 events {
   worker_connections 1024;
+}
 http {
@@ @@ -23,16 +23,15 @@ http { @@
   access_log off;
   autoindex on;
   include "/tmp/light9_nginx_routes.conf";
   location / {
     proxy_pass http://localhost:8300;
+  }
+ }
+}
 EOF
 head -1 /tmp/light9_nginx_routes.conf
 pnpm vite -c light9/homepage/vite.config.ts &
 /usr/sbin/nginx -c $CONF
 wait

light9/homepage/write_config.py

➞

Show inline comments

@@ file renamed from bin/homepageConfig to light9/homepage/write_config.py @@
 #!bin/python
 from run_local import log
 from light9 import showconfig
 from light9.namespaces import L9
 import sys
 from urllib.parse import urlparse
 log.info('generating config')
 graph = showconfig.getGraph()
 netHome = graph.value(showconfig.showUri(), L9['networking'])
 webServer = graph.value(netHome, L9['webServer'])
 if not webServer:
     raise ValueError('no %r :webServer' % netHome)
 print("listen %s;" % urlparse(webServer).port)
 from light9 import showconfig
 from light9.namespaces import L9
 from light9.run_local import log
 def location(path, server, viteServer):
     print(f"""
 def main():
     [outPath] = sys.argv[1:]
     log.info('generating config')
     graph = showconfig.getGraph()
     netHome = graph.value(showconfig.showUri(), L9['networking'])
     webServer = graph.value(netHome, L9['webServer'])
     if not webServer:
         raise ValueError('no %r :webServer' % netHome)
     location = /{path}/metrics {{
       rewrite ^/{path}(/.*) $1 break;
       proxy_pass {server};
     }}
     with open(outPath, 'wt') as out:
         line = "listen %s;" % urlparse(str(webServer)).port
         print(line, file=out)
         log.info(line)
         def location(path, server, viteServer):
             print(f"""
     location /{path}/api/ {{
       # just the tail part for services
       rewrite ^/{path}/api(/.*) $1 break;
       proxy_pass {server};
         location = /{path}/metrics {{
           rewrite ^/{path}(/.*) $1 break;
           proxy_pass {server};
         }}
         location /{path}/api/ {{
           # just the tail part for services
           rewrite ^/{path}/api(/.*) $1 break;
           proxy_pass {server};
       # for websocket
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
       proxy_set_header Host $host;
           # for websocket
           proxy_http_version 1.1;
           proxy_set_header Upgrade $http_upgrade;
           proxy_set_header Connection "upgrade";
           proxy_set_header Host $host;
           proxy_buffering off;
       proxy_buffering off;
         }}
         location /{path}/ {{
           # vite has 'base' to deal with the /{path}/ part of the request
           proxy_pass {viteServer};
         }}
         """,
                   file=out)
     }}
     location /{path}/ {{
       # vite has 'base' to deal with the /{path}/ part of the request
       proxy_pass {viteServer};
     }}
         for role, server in sorted(graph.predicate_objects(netHome)):
             if not str(server).startswith('http') or role == L9['webServer']:
                 continue
             path = graph.value(role, L9['urlPath'])
             if not path:
                 continue
             server = str(server).rstrip('/')
             viteServer = server.replace('82', '83')  # rewrite this please
             location(path, server, viteServer)
     """)
         showPath = showconfig.showUri().split('/', 3)[-1]
         root = showconfig.root()[:-len(showPath)].decode('ascii')
         print(f"""
         location /{showPath} {{
           root {root};
         }}""", file=out)
 for role, server in sorted(graph.predicate_objects(netHome)):
     if not server.startswith('http') or role == L9['webServer']:
         continue
     path = graph.value(role, L9['urlPath'])
     if not path:
         continue
     server = server.rstrip('/')
     viteServer = server.replace('82', '83') # rewrite this please
     location(path, server, viteServer)
 showPath = showconfig.showUri().split('/', 3)[-1]
 root = showconfig.root()[:-len(showPath)].decode('ascii')
 print(f"""
     location /{showPath} {{
       root {root};
     }}""")
 if __name__ == '__main__':
     main()
@@ \ No newline at end of file @@

light9/homepage/write_config_test.py

➞

Show inline comments

@@ new file 100644 @@
 def test_import():
     import write_config
     # no crash

0 comments (0 inline, 0 general)