Skip to content

Commit 57130de

Browse files
committed
chore: code style consistency
1 parent 9c205ed commit 57130de

File tree

2 files changed

+25
-30
lines changed

2 files changed

+25
-30
lines changed

src/ngx_stream_lua_common.h

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -277,33 +277,19 @@ struct ngx_stream_lua_srv_conf_s {
277277
code cache */
278278

279279
ngx_stream_lua_handler_pt preread_handler;
280+
u_char *preread_chunkname;
281+
ngx_stream_complex_value_t preread_src;
282+
u_char *preread_src_key;
280283

281284
ngx_stream_lua_handler_pt content_handler;
282-
ngx_stream_lua_handler_pt log_handler;
283-
284-
u_char *preread_chunkname;
285-
ngx_stream_complex_value_t preread_src; /* access_by_lua
286-
inline script/script
287-
file path */
288-
289-
u_char *preread_src_key; /* cached key for access_src */
290-
291-
u_char *content_chunkname;
285+
u_char *content_chunkname;
286+
ngx_stream_complex_value_t content_src;
287+
u_char *content_src_key;
292288

293-
ngx_stream_complex_value_t content_src;
294-
/* content_by_lua
295-
* inline script/script
296-
* file path */
297-
298-
u_char *content_src_key; /* cached key for content_src */
299-
300-
u_char *log_chunkname;
301-
ngx_stream_complex_value_t log_src;
302-
/* log_by_lua inline script/script
303-
* file path */
304-
305-
u_char *log_src_key;
306-
/* cached key for log_src */
289+
ngx_stream_lua_handler_pt log_handler;
290+
u_char *log_chunkname;
291+
ngx_stream_complex_value_t log_src;
292+
u_char *log_src_key;
307293

308294

309295
ngx_msec_t keepalive_timeout;

src/ngx_stream_lua_module.c

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,8 @@ ngx_stream_lua_create_main_conf(ngx_conf_t *cf)
718718
* lmcf->shm_zones = NULL;
719719
* lmcf->init_handler = NULL;
720720
* lmcf->init_src = { 0, NULL };
721+
* lmcf->init_worker_handler = NULL;
722+
* lmcf->init_worker_src = { 0, NULL };
721723
* lmcf->shm_zones_inited = 0;
722724
* lmcf->shdict_zones = NULL;
723725
* lmcf->preload_hooks = NULL;
@@ -821,13 +823,20 @@ ngx_stream_lua_create_srv_conf(ngx_conf_t *cf)
821823
* lscf->srv.ssl_cert_src = { 0, NULL };
822824
* lscf->srv.ssl_cert_src_key = NULL;
823825
*
824-
* lscf->srv.ssl_session_store_handler = NULL;
825-
* lscf->srv.ssl_session_store_src = { 0, NULL };
826-
* lscf->srv.ssl_session_store_src_key = NULL;
826+
* lscf->preread_handler = NULL;
827+
* lscf->preread_chunkname = NULL;
828+
* lscf->preread_src = {{ 0, NULL }, NULL, NULL, NULL};
829+
* lscf->preread_src_key = NULL;
827830
*
828-
* lscf->srv.ssl_session_fetch_handler = NULL;
829-
* lscf->srv.ssl_session_fetch_src = { 0, NULL };
830-
* lscf->srv.ssl_session_fetch_src_key = NULL;
831+
* lscf->content_handler = NULL;
832+
* lscf->content_chunkname = NULL;
833+
* lscf->content_src = {{ 0, NULL }, NULL, NULL, NULL};
834+
* lscf->content_src_key = NULL;
835+
836+
* lscf->log_handler = NULL;
837+
* lscf->log_chunkname = NULL;
838+
* lscf->log_src = {{ 0, NULL }, NULL, NULL, NULL};
839+
* lscf->log_src_key = NULL;
831840
*
832841
* lscf->balancer.handler = NULL;
833842
* lscf->balancer.src = { 0, NULL };

0 commit comments

Comments
 (0)