Skip to content

style: code style consistency #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

style: code style consistency #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 10 additions & 24 deletions src/ngx_stream_lua_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,33 +277,19 @@ struct ngx_stream_lua_srv_conf_s {
code cache */

ngx_stream_lua_handler_pt preread_handler;
u_char *preread_chunkname;
ngx_stream_complex_value_t preread_src;
u_char *preread_src_key;

ngx_stream_lua_handler_pt content_handler;
ngx_stream_lua_handler_pt log_handler;

u_char *preread_chunkname;
ngx_stream_complex_value_t preread_src; /* access_by_lua
inline script/script
file path */

u_char *preread_src_key; /* cached key for access_src */

u_char *content_chunkname;
u_char *content_chunkname;
ngx_stream_complex_value_t content_src;
u_char *content_src_key;

ngx_stream_complex_value_t content_src;
/* content_by_lua
* inline script/script
* file path */

u_char *content_src_key; /* cached key for content_src */

u_char *log_chunkname;
ngx_stream_complex_value_t log_src;
/* log_by_lua inline script/script
* file path */

u_char *log_src_key;
/* cached key for log_src */
ngx_stream_lua_handler_pt log_handler;
u_char *log_chunkname;
ngx_stream_complex_value_t log_src;
u_char *log_src_key;


ngx_msec_t keepalive_timeout;
Expand Down
21 changes: 15 additions & 6 deletions src/ngx_stream_lua_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,8 @@ ngx_stream_lua_create_main_conf(ngx_conf_t *cf)
* lmcf->shm_zones = NULL;
* lmcf->init_handler = NULL;
* lmcf->init_src = { 0, NULL };
* lmcf->init_worker_handler = NULL;
* lmcf->init_worker_src = { 0, NULL };
* lmcf->shm_zones_inited = 0;
* lmcf->shdict_zones = NULL;
* lmcf->preload_hooks = NULL;
Expand Down Expand Up @@ -821,13 +823,20 @@ ngx_stream_lua_create_srv_conf(ngx_conf_t *cf)
* lscf->srv.ssl_cert_src = { 0, NULL };
* lscf->srv.ssl_cert_src_key = NULL;
*
* lscf->srv.ssl_session_store_handler = NULL;
* lscf->srv.ssl_session_store_src = { 0, NULL };
* lscf->srv.ssl_session_store_src_key = NULL;
* lscf->preread_handler = NULL;
* lscf->preread_chunkname = NULL;
* lscf->preread_src = {{ 0, NULL }, NULL, NULL, NULL};
* lscf->preread_src_key = NULL;
*
* lscf->srv.ssl_session_fetch_handler = NULL;
* lscf->srv.ssl_session_fetch_src = { 0, NULL };
* lscf->srv.ssl_session_fetch_src_key = NULL;
* lscf->content_handler = NULL;
* lscf->content_chunkname = NULL;
* lscf->content_src = {{ 0, NULL }, NULL, NULL, NULL};
* lscf->content_src_key = NULL;

* lscf->log_handler = NULL;
* lscf->log_chunkname = NULL;
* lscf->log_src = {{ 0, NULL }, NULL, NULL, NULL};
* lscf->log_src_key = NULL;
*
* lscf->balancer.handler = NULL;
* lscf->balancer.src = { 0, NULL };
Expand Down