Skip to content

Commit 4679522

Browse files
committed
Allow both upsyncs at once
1 parent 2420672 commit 4679522

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/ngx_stream_upsync_module.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ static http_parser_settings settings = {
254254
.on_message_complete = 0
255255
};
256256

257-
ngx_atomic_t upsync_shared_created0;
258-
ngx_atomic_t *upsync_shared_created = &upsync_shared_created0;
257+
ngx_atomic_t stream_upsync_shared_created0;
258+
ngx_atomic_t *stream_upsync_shared_created = &stream_upsync_shared_created0;
259259

260260
static http_parser *parser = NULL;
261261
static ngx_stream_http_state state;
@@ -1913,10 +1913,10 @@ ngx_stream_upsync_init_shm_mutex(ngx_cycle_t *cycle)
19131913

19141914
upsync_server = upsync_ctx->upsync_server;
19151915

1916-
if (*upsync_shared_created) {
1917-
shm.size = 128 * (*upsync_shared_created);
1916+
if (*stream_upsync_shared_created) {
1917+
shm.size = 128 * (*stream_upsync_shared_created);
19181918
shm.log = cycle->log;
1919-
shm.addr = (u_char *)(upsync_shared_created);
1919+
shm.addr = (u_char *)(stream_upsync_shared_created);
19201920
shm.name.len = sizeof("ngx_upsync_shared_zone");
19211921
shm.name.data = (u_char *)"ngx_upsync_shared_zone";
19221922

@@ -1942,7 +1942,7 @@ ngx_stream_upsync_init_shm_mutex(ngx_cycle_t *cycle)
19421942
}
19431943
shared = shm.addr;
19441944

1945-
upsync_shared_created = (ngx_atomic_t *)shared;
1945+
stream_upsync_shared_created = (ngx_atomic_t *)shared;
19461946

19471947
for (i = 0; i < upsync_ctx->upstream_num; i++) {
19481948

@@ -1970,7 +1970,7 @@ ngx_stream_upsync_init_shm_mutex(ngx_cycle_t *cycle)
19701970
}
19711971
}
19721972

1973-
ngx_atomic_cmp_set(upsync_shared_created, *upsync_shared_created,
1973+
ngx_atomic_cmp_set(stream_upsync_shared_created, *stream_upsync_shared_created,
19741974
upsync_ctx->upstream_num);
19751975

19761976
return NGX_OK;

0 commit comments

Comments
 (0)