@@ -15,6 +15,7 @@ typedef struct {
15
15
ngx_resolver_t * resolver ;
16
16
ngx_msec_t resolver_timeout ;
17
17
ngx_http_upstream_resolved_t * resolved ;
18
+ ngx_event_t timer ;
18
19
} ngx_http_upstream_dynamic_server_conf_t ;
19
20
20
21
typedef struct {
@@ -322,7 +323,7 @@ static ngx_int_t ngx_http_upstream_dynamic_servers_init_process(ngx_cycle_t *cyc
322
323
dynamic_server [i ].resolver = core_loc_conf -> resolver ;
323
324
ngx_conf_merge_msec_value (dynamic_server [i ].resolver_timeout , core_loc_conf -> resolver_timeout , 30000 );
324
325
325
- timer = ngx_pcalloc ( cycle -> pool , sizeof ( ngx_event_t )) ;
326
+ timer = & dynamic_server [ i ]. timer ;
326
327
timer -> handler = ngx_http_upstream_dynamic_server_resolve ;
327
328
timer -> log = cycle -> log ;
328
329
timer -> data = & dynamic_server [i ];
@@ -548,13 +549,7 @@ static void ngx_http_upstream_dynamic_server_resolve_handler(ngx_resolver_ctx_t
548
549
return ;
549
550
}
550
551
551
- ngx_event_t * timer ;
552
- timer = ngx_pcalloc (ngx_cycle -> pool , sizeof (ngx_event_t ));
553
-
554
- timer -> handler = ngx_http_upstream_dynamic_server_resolve ;
555
- timer -> log = ngx_cycle -> log ;
556
- timer -> data = dynamic_server ;
557
- ngx_add_timer (timer , 1000 );
552
+ ngx_add_timer (& dynamic_server -> timer , 1000 );
558
553
}
559
554
560
555
// Copied from src/core/ngx_resolver.c (nginx version 1.7.7).
0 commit comments