Skip to content

parser: Support [PARSER] sections in main configuration file #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

parser: Support [PARSER] sections in main configuration file #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/fluent-bit/flb_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ struct flb_parser *flb_parser_create(const char *name, const char *format,
int types_len,
struct mk_list *decoders,
struct flb_config *config);
int flb_parser_sections(const char * file, struct flb_config *config, struct mk_rconf *fconf);
int flb_parser_conf_file(const char *file, struct flb_config *config);
void flb_parser_destroy(struct flb_parser *parser);
struct flb_parser *flb_parser_get(const char *name, struct flb_config *config);
Expand Down
95 changes: 51 additions & 44 deletions src/flb_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,12 +391,9 @@ static int proc_types_str(const char *types_str, struct flb_parser_types **types
return i;
}

/* Load parsers from a configuration file */
int flb_parser_conf_file(const char *file, struct flb_config *config)
/* Load parser sections into config*/
int flb_parser_sections(const char * file, struct flb_config *config, struct mk_rconf *fconf)
{
int ret;
char tmp[PATH_MAX + 1];
const char *cfg = NULL;
char *name;
char *format;
char *regex;
Expand All @@ -407,40 +404,11 @@ int flb_parser_conf_file(const char *file, struct flb_config *config)
char *str;
int time_keep;
int types_len;
struct mk_rconf *fconf;
struct mk_rconf_section *section;
struct mk_list *head;
struct stat st;
struct flb_parser_types *types = NULL;
struct mk_list *decoders;

#ifndef FLB_HAVE_STATIC_CONF
ret = stat(file, &st);
if (ret == -1 && errno == ENOENT) {
/* Try to resolve the real path (if exists) */
if (file[0] == '/') {
flb_utils_error(FLB_ERR_CFG_PARSER_FILE);
return -1;
}

if (config->conf_path) {
snprintf(tmp, PATH_MAX, "%s%s", config->conf_path, file);
cfg = tmp;
}
}
else {
cfg = file;
}

fconf = mk_rconf_open(cfg);
#else
fconf = flb_config_static_open(file);
#endif

if (!fconf) {
return -1;
}

/* Read all [PARSER] sections */
mk_list_foreach(head, &fconf->sections) {
name = NULL;
Expand All @@ -459,22 +427,22 @@ int flb_parser_conf_file(const char *file, struct flb_config *config)
/* Name */
name = mk_rconf_section_get_key(section, "Name", MK_RCONF_STR);
if (!name) {
flb_error("[parser] no parser 'name' found in file '%s'", cfg);
goto fconf_error;
flb_error("[parser] no parser 'name' found in file '%s'", file);
goto cleanup;
}

/* Format */
format = mk_rconf_section_get_key(section, "Format", MK_RCONF_STR);
if (!format) {
flb_error("[parser] no parser 'format' found for '%s' in file '%s'", name, cfg);
goto fconf_error;
flb_error("[parser] no parser 'format' found for '%s' in file '%s'", name, file);
goto cleanup;
}

/* Regex (if format is regex) */
regex = mk_rconf_section_get_key(section, "Regex", MK_RCONF_STR);
if (!regex && strcmp(format, "regex") == 0) {
flb_error("[parser] no parser 'regex' found for '%s' in file '%s", name, cfg);
goto fconf_error;
flb_error("[parser] no parser 'regex' found for '%s' in file '%s", name, file);
goto cleanup;
}

/* Time_Format */
Expand Down Expand Up @@ -517,7 +485,7 @@ int flb_parser_conf_file(const char *file, struct flb_config *config)
if (!flb_parser_create(name, format, regex,
time_fmt, time_key, time_offset, time_keep,
types, types_len, decoders, config)) {
goto fconf_error;
goto cleanup;
}

flb_debug("[parser] new parser registered: %s", name);
Expand All @@ -544,10 +512,9 @@ int flb_parser_conf_file(const char *file, struct flb_config *config)
decoders = NULL;
}

mk_rconf_free(fconf);
return 0;

fconf_error:
cleanup:
flb_free(name);
flb_free(format);
if (regex) {
Expand All @@ -565,10 +532,50 @@ int flb_parser_conf_file(const char *file, struct flb_config *config)
if (decoders) {
flb_parser_decoder_list_destroy(decoders);
}
mk_rconf_free(fconf);
return -1;
}

/* Load parsers from a configuration file */
int flb_parser_conf_file(const char *file, struct flb_config *config)
{
int ret = -1;
char tmp[PATH_MAX + 1];
const char *cfg = NULL;
struct mk_rconf *fconf;
struct stat st;

#ifndef FLB_HAVE_STATIC_CONF
ret = stat(file, &st);
if (ret == -1 && errno == ENOENT) {
/* Try to resolve the real path (if exists) */
if (file[0] == '/') {
flb_utils_error(FLB_ERR_CFG_PARSER_FILE);
return -1;
}

if (config->conf_path) {
snprintf(tmp, PATH_MAX, "%s%s", config->conf_path, file);
cfg = tmp;
}
}
else {
cfg = file;
}

fconf = mk_rconf_open(cfg);
#else
fconf = flb_config_static_open(file);
#endif

if (!fconf) {
return -1;
}

ret = flb_parser_sections(cfg, config, fconf);
mk_rconf_free(fconf);
return ret;
}

struct flb_parser *flb_parser_get(const char *name, struct flb_config *config)
{
struct mk_list *head;
Expand Down
20 changes: 8 additions & 12 deletions src/fluent-bit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ static int flb_service_conf(struct flb_config *config, char *file)
section = mk_list_entry(head, struct mk_rconf_section, _head);

if (strcasecmp(section->name, "SERVICE") == 0 ||
strcasecmp(section->name, "PARSER") == 0 ||
strcasecmp(section->name, "INPUT") == 0 ||
strcasecmp(section->name, "FILTER") == 0 ||
strcasecmp(section->name, "OUTPUT") == 0) {
Expand All @@ -421,18 +422,9 @@ static int flb_service_conf(struct flb_config *config, char *file)
continue;
}

/* Extra sanity checks */
if (strcasecmp(section->name, "PARSER") == 0) {
fprintf(stderr,
"Section [PARSER] is not valid in the main "
"configuration file. It belongs to \n"
"the Parsers_File configuration files.\n");
}
else {
fprintf(stderr,
"Error: unexpected section [%s] in the main "
"configuration file.\n", section->name);
}
fprintf(stderr,
"Error: unexpected section [%s] in the main "
"configuration file.\n", section->name);
exit(EXIT_FAILURE);
}

Expand All @@ -447,6 +439,10 @@ static int flb_service_conf(struct flb_config *config, char *file)
}
}

/* Read all [PARSER] sections */
if (flb_parser_sections(file, config, fconf)) {
goto flb_service_conf_end;
}

/* Read all [INPUT] sections */
mk_list_foreach(head, &fconf->sections) {
Expand Down