baha/skyline-apiserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Add nginx option "listen_address" and "log_dir"

Browse Source 
Add nginx option "listen_address" and "log_dir"

Change-Id: I161f76155b7cf34ef3bf4ea1f2416798aa533920
This commit is contained in:
yangshaoxue 2022-02-15 16:56:39 +08:00
parent 47291a2365
commit c397f97cc4
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py
View File

@ -129,7 +129,19 @@ def get_proxy_endpoints() -> Dict[str, ProxyEndpoint]:
"ssl_keyfile", "ssl_keyfile",
help=("SSL key file path."), help=("SSL key file path."),
) )
def main(output_file_path: str, ssl_certfile: str, ssl_keyfile: str) -> None: @click.option(
"--listen-address",
"listen_address",
help=("nginx listen address."),
)
@click.option(
"--log-dir",
"log_dir",
help=("skyline log file address."),
)
def main(
output_file_path: str, ssl_certfile: str, ssl_keyfile: str, listen_address: str, log_dir: str
) -> None:
try: try:
configure("skyline") configure("skyline")
setup(StreamHandler(), debug=CONF.default.debug) setup(StreamHandler(), debug=CONF.default.debug)
@ -150,7 +162,11 @@ def main(output_file_path: str, ssl_certfile: str, ssl_keyfile: str) -> None:
if ssl_certfile: if ssl_certfile:
context.update(ssl_certfile=ssl_certfile) context.update(ssl_certfile=ssl_certfile)
if ssl_keyfile: if ssl_keyfile:
context.update(ssl_certfile=ssl_keyfile) context.update(ssl_keyfile=ssl_keyfile)
if listen_address:
context.update(listen_address=listen_address)
if log_dir:
context.update(log_dir=log_dir)
result = template.render(**context) result = template.render(**context)
if output_file_path: if output_file_path:

6
libs/skyline-nginx/skyline_nginx/templates/nginx.conf.j2
View File

@ -44,8 +44,8 @@ http {
'"$upstream_response_time" "$request" ' '"$upstream_response_time" "$request" '
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/kolla/skyline/nginx_access.log main; access_log {{ log_dir | default('/var/log/kolla/') }}skyline/nginx_access.log main;
error_log /var/log/kolla/skyline/nginx_error.log; error_log {{ log_dir | default('/var/log/kolla/') }}skyline/nginx_error.log;
## ##
# Gzip Settings # Gzip Settings
@ -69,7 +69,7 @@ http {
# Virtual Host Configs # Virtual Host Configs
## ##
server { server {
listen 9999 ssl http2 default_server; listen {{ listen_address | default('0.0.0.0:9999') }} ssl http2 default_server;
root {{ skyline_console_static_path }}; root {{ skyline_console_static_path }};