Skip to content
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

Support include directive for config file #2878

Merged
merged 20 commits into from
Feb 14, 2022
Merged

Support include directive for config file #2878

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d3fa81a
Support include import configuration
Jan 12, 2022
063876a
Remove support for regular rules
Jan 17, 2022
6ed21b3
Remove support for regular rules
Jan 18, 2022
fddb6a1
Fix configuration file parsing bug
Jan 24, 2022
90c83e3
Added utest tests for include functionality
Jan 25, 2022
e6bda1f
Added utest tests for include functionality
Jan 26, 2022
180ec64
Modify the UTest function
Jan 27, 2022
0a35803
optimized code
Feb 8, 2022
2c129be
Config: Refine parse error with state
winlinvip Feb 13, 2022
c7eb4e6
Config: Reorder functions
winlinvip Feb 13, 2022
71f452a
Config: Rename parsing type to context
winlinvip Feb 13, 2022
c22024f
Config: Refine args for include
winlinvip Feb 13, 2022
457fd93
Config: Add utests for include
winlinvip Feb 13, 2022
fd70923
Config: Refine code, parsing recursively.
winlinvip Feb 13, 2022
f7ad8c5
Config: Change the mock from file to buffer
winlinvip Feb 13, 2022
a66680a
Config: Mock buffer in config
winlinvip Feb 13, 2022
818ecad
Config: Refine code
winlinvip Feb 13, 2022
9dd30d8
Merge pull request #1 from winlinvip/feature/config-include
mapengfei53 Feb 13, 2022
80b5d1d
Add utests for include
Feb 13, 2022
9f5850e
Added utest for include
Feb 14, 2022
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
52 changes: 33 additions & 19 deletions trunk/src/app/srs_app_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,35 +1014,49 @@ srs_error_t SrsConfDirective::parse_conf(SrsConfigBuffer* buffer, SrsDirectiveTy
}

// build directive tree.
if (args[0] == "include") {
if (args.at(0) == "include") {
if (args.size() < 2) {
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "line %d: include is empty directive", buffer->line);
}
#if 0
winlinvip marked this conversation as resolved.
Show resolved Hide resolved
for (int i = 1; i < (int)args.size(); i++) {
std::string file = args.at(i);

if (!srs_string_contains(file, "*", "?", "[")) {
srs_trace("config parse include %s", file.c_str());
srs_freep(err);
if ((err = conf->parse_include_file(file.c_str())) != srs_success) {
return srs_error_wrap(err, "parse file");
}
} else {
unsigned long i = 0;
glob_t glob_buf;

if (glob((char *) file.c_str(), 0, NULL, &glob_buf) != 0) {
winlinvip marked this conversation as resolved.
Show resolved Hide resolved
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "line %d: parse include %s failed", buffer->line, file.c_str());
}

while(i < glob_buf.gl_pathc) {
srs_trace("include %s", *(glob_buf.gl_pathv+i));
srs_freep(err);
if ((err = conf->parse_include_file(*(glob_buf.gl_pathv+i))) != srs_success) {
return srs_error_wrap(err, "parse file");
}
i ++;
}
}
}
#else
for (int i = 1; i < (int)args.size(); i++) {
std::string file = args.at(i);

std::string file = args[1];
if (!srs_string_contains(file, "*", "?", "[")) {
srs_trace("config parse include %s", file.c_str());
srs_freep(err);
if ((err = conf->parse_include_file(file.c_str())) != srs_success) {
return srs_error_wrap(err, "parse file");
}
} else {
unsigned long i = 0;
glob_t glob_buf;

if (glob((char *) file.c_str(), 0, NULL, &glob_buf) != 0) {
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "line %d: parse include %s failed", buffer->line, file.c_str());
}

while(i < glob_buf.gl_pathc) {
srs_trace("include %s", *(glob_buf.gl_pathv+i));
srs_freep(err);
if ((err = conf->parse_include_file(*(glob_buf.gl_pathv+i))) != srs_success) {
return srs_error_wrap(err, "parse file");
}
i ++;
}
}
#endif
} else {
SrsConfDirective* directive = new SrsConfDirective();

Expand Down