Skip to content

Commit ac4f28c

Browse files
committed
style: minor fixes to align with ngx_http_lua.
1 parent 90df752 commit ac4f28c

6 files changed

+24
-23
lines changed

src/subsys/api/ngx_subsys_lua_api.h.tt2

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ ngx_int_t ngx_[% subsys %]_lua_add_package_preload(ngx_conf_t *cf,
6060
ngx_int_t ngx_[% subsys %]_lua_shared_dict_get(ngx_shm_zone_t *shm_zone,
6161
u_char *key_data, size_t key_len, ngx_[% subsys %]_lua_value_t *value);
6262

63-
ngx_shm_zone_t *ngx_[% subsys %]_lua_find_zone(u_char *name_data, size_t name_len);
63+
ngx_shm_zone_t *ngx_[% subsys %]_lua_find_zone(u_char *name_data,
64+
size_t name_len);
6465

6566
ngx_shm_zone_t *ngx_[% subsys %]_lua_shared_memory_add(ngx_conf_t *cf,
6667
ngx_str_t *name, size_t size, void *tag);

src/subsys/ngx_subsys_lua_api.c.tt2

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ ngx_[% subsys %]_lua_add_package_preload(ngx_conf_t *cf, const char *package,
8585

8686

8787
ngx_shm_zone_t *
88-
ngx_[% subsys %]_lua_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name, size_t size,
89-
void *tag)
88+
ngx_[% subsys %]_lua_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name,
89+
size_t size, void *tag)
9090
{
9191
ngx_[% subsys %]_lua_main_conf_t *lmcf;
9292
ngx_[% subsys %]_lua_shm_zone_ctx_t *ctx;

src/subsys/ngx_subsys_lua_balancer.c.tt2

+1-1
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ ngx_[% subsys %]_lua_ffi_balancer_set_more_tries([% req_type %] *r,
803803
[% ELSIF stream_subsys %]
804804
#if (HAS_NGX_STREAM_PROXY_GET_NEXT_UPSTREAM_TRIES_PATCH)
805805
[% END %]
806-
ngx_uint_t max_tries, total;
806+
ngx_uint_t max_tries, total;
807807
#endif
808808
ngx_[% subsys %]_lua_ctx_t *ctx;
809809
ngx_[% subsys %]_upstream_t *u;

src/subsys/ngx_subsys_lua_initworkerby.c.tt2

+3-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ ngx_[% subsys %]_lua_init_worker(ngx_cycle_t *cycle)
7474
# endif
7575
)
7676
{
77+
/* disable init_worker_by_lua* and destroy lua VM in cache processes */
78+
7779
ngx_log_debug2(NGX_LOG_DEBUG_[% SUBSYS %], ngx_cycle->log, 0,
7880
"lua close the global Lua VM %p in the "
7981
"cache helper process %P", lmcf->lua, ngx_pid);
@@ -94,7 +96,7 @@ ngx_[% subsys %]_lua_init_worker(ngx_cycle_t *cycle)
9496

9597
#endif /* NGX_WIN32 */
9698

97-
#if NGX_[% SUBSYS %]_LUA_HAVE_SA_RESTART
99+
#if (NGX_[% SUBSYS %]_LUA_HAVE_SA_RESTART)
98100
if (lmcf->set_sa_restart) {
99101
ngx_[% subsys %]_lua_set_sa_restart(ngx_cycle->log);
100102
}

src/subsys/ngx_subsys_lua_module.c.tt2

+10-10
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ static ngx_command_t ngx_[% subsys %]_lua_cmds[] = {
722722

723723

724724
ngx_[% subsys %]_module_t ngx_[% subsys %]_lua_module_ctx = {
725-
NULL, /* preconfiguration */
725+
NULL, /* preconfiguration */
726726
ngx_[% subsys %]_lua_init, /* postconfiguration */
727727

728728
ngx_[% subsys %]_lua_create_main_conf, /* create main configuration */
@@ -742,14 +742,14 @@ ngx_module_t ngx_[% subsys %]_lua_module = {
742742
NGX_MODULE_V1,
743743
&ngx_[% subsys %]_lua_module_ctx, /* module context */
744744
ngx_[% subsys %]_lua_cmds, /* module directives */
745-
NGX_[% SUBSYS %]_MODULE, /* module type */
746-
NULL, /* init master */
747-
NULL, /* init module */
745+
NGX_[% SUBSYS %]_MODULE, /* module type */
746+
NULL, /* init master */
747+
NULL, /* init module */
748748
ngx_[% subsys %]_lua_init_worker, /* init process */
749-
NULL, /* init thread */
750-
NULL, /* exit thread */
751-
NULL, /* exit process */
752-
NULL, /* exit master */
749+
NULL, /* init thread */
750+
NULL, /* exit thread */
751+
NULL, /* exit process */
752+
NULL, /* exit master */
753753
NGX_MODULE_V1_PADDING
754754
};
755755

@@ -1304,7 +1304,7 @@ ngx_[% subsys %]_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
13041304
if (sscf && sscf->ssl.ctx) {
13051305
#ifdef LIBRESSL_VERSION_NUMBER
13061306
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
1307-
"LibreSSL does not support "
1307+
"LibreSSL is not supported by "
13081308
"ssl_session_store_by_lua*");
13091309

13101310
return NGX_CONF_ERROR;
@@ -1326,7 +1326,7 @@ ngx_[% subsys %]_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
13261326
if (sscf && sscf->ssl.ctx) {
13271327
#ifdef LIBRESSL_VERSION_NUMBER
13281328
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
1329-
"LibreSSL does not support "
1329+
"LibreSSL is not supported by "
13301330
"ssl_session_fetch_by_lua*");
13311331

13321332
return NGX_CONF_ERROR;

src/subsys/ngx_subsys_lua_socket_tcp.c.tt2

+6-8
Original file line numberDiff line numberDiff line change
@@ -1929,12 +1929,12 @@ new_ssl_name:
19291929

19301930
c->ssl->handler = ngx_[% subsys %]_lua_ssl_handshake_handler;
19311931

1932-
if (ctx->entered_content_phase) {
1933-
r->write_event_handler = ngx_[% subsys %]_lua_content_wev_handler;
1932+
if (ctx->entered_content_phase) {
1933+
r->write_event_handler = ngx_[% subsys %]_lua_content_wev_handler;
19341934

1935-
} else {
1936-
r->write_event_handler = ngx_[% req_subsys %]_core_run_phases;
1937-
}
1935+
} else {
1936+
r->write_event_handler = ngx_[% req_subsys %]_core_run_phases;
1937+
}
19381938

19391939
return lua_yield(L, 0);
19401940
}
@@ -2864,9 +2864,7 @@ success:
28642864
/* rc == NGX_AGAIN */
28652865

28662866
[% IF http_subsys %]
2867-
if (u->body_downstream
2868-
&& r->request_body->rest == 0)
2869-
{
2867+
if (u->body_downstream && r->request_body->rest == 0) {
28702868
u->eof = 1;
28712869
}
28722870
[% END %]

0 commit comments

Comments
 (0)