From 06f46993997ee02739097f6fc1cbfca98f96e71e Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Thu, 27 Dec 2012 17:19:01 +0400 Subject: [PATCH] disabled auto-push sockets for non-workers (cache processes); clients still connect to them --- ngx_rtmp_auto_push_module.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ngx_rtmp_auto_push_module.c b/ngx_rtmp_auto_push_module.c index d1ed394..de24818 100644 --- a/ngx_rtmp_auto_push_module.c +++ b/ngx_rtmp_auto_push_module.c @@ -103,6 +103,9 @@ ngx_rtmp_auto_push_init_process(ngx_cycle_t *cycle) size_t n; ngx_file_info_t fi; + if (ngx_process != NGX_PROCESS_WORKER) { + return NGX_OK; + } apcf = (ngx_rtmp_auto_push_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_rtmp_auto_push_module); @@ -110,14 +113,12 @@ ngx_rtmp_auto_push_init_process(ngx_cycle_t *cycle) return NGX_OK; } - next_publish = ngx_rtmp_publish; ngx_rtmp_publish = ngx_rtmp_auto_push_publish; next_delete_stream = ngx_rtmp_delete_stream; ngx_rtmp_delete_stream = ngx_rtmp_auto_push_delete_stream; - reuseaddr = 1; s = (ngx_socket_t) -1; @@ -341,7 +342,7 @@ ngx_rtmp_auto_push_reconnect(ngx_event_t *ev) } pid = ngx_processes[n].pid; - if (pid == 0 || pid == -1) { + if (pid == 0 || pid == NGX_INVALID_PID) { continue; }