Skip to content

Commit a07d45a

Browse files
authored
bin: config: reload: Enable hot reloading via config file (#7204)
* bin: config: reload: Enable hot reloading via config file This service configuration option should be used as: ```conf [SERVICE] hot_reload on # .. other stuffs ``` Signed-off-by: Hiroshi Hatake <[email protected]>
1 parent 16996e1 commit a07d45a

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

include/fluent-bit/flb_config.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@ enum conf_type {
336336
#define FLB_CONF_STR_ENABLE_CHUNK_TRACE "Enable_Chunk_Trace"
337337
#endif /* FLB_HAVE_CHUNK_TRACE */
338338

339+
#define FLB_CONF_STR_HOT_RELOAD "Hot_Reload"
340+
339341
/* DNS */
340342
#define FLB_CONF_DNS_MODE "dns.mode"
341343
#define FLB_CONF_DNS_RESOLVER "dns.resolver"

src/flb_config.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ struct flb_service_config service_configs[] = {
173173
offsetof(struct flb_config, enable_chunk_trace)},
174174
#endif
175175

176+
{FLB_CONF_STR_HOT_RELOAD,
177+
FLB_CONF_TYPE_BOOL,
178+
offsetof(struct flb_config, enable_hot_reload)},
179+
176180
{NULL, FLB_CONF_TYPE_OTHER, 0} /* end of array */
177181
};
178182

src/flb_reload.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,6 @@ int flb_reload(flb_ctx_t *ctx, struct flb_cf *cf_opts)
422422
/* Inherit verbose from the old ctx instance */
423423
verbose = ctx->config->verbose;
424424
new_config->verbose = verbose;
425-
enable_reloading = ctx->config->enable_hot_reload;
426-
new_config->enable_hot_reload = enable_reloading;
427425

428426
#ifdef FLB_HAVE_STREAM_PROCESSOR
429427
/* Inherit stream processor definitions from command line */

src/fluent-bit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ int flb_main(int argc, char **argv)
979979
config->support_mode = FLB_TRUE;
980980
break;
981981
case 'Y':
982-
config->enable_hot_reload = FLB_TRUE;
982+
flb_cf_section_property_add(cf_opts, service->properties, FLB_CONF_STR_HOT_RELOAD, 0, "on", 0);
983983
break;
984984
#ifdef FLB_HAVE_CHUNK_TRACE
985985
case 'Z':

0 commit comments

Comments
 (0)