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

Jump to bottom

Remove check whether config file is a regular file #1248

Merged
merged 2 commits into from
Dec 18, 2020
Merged

Remove check whether config file is a regular file #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1442542
Remove check whether config file is a regular file
dominiklohmann Dec 18, 2020
e613781
Add missing changelog entry
dominiklohmann Dec 18, 2020
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
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ Every entry has a category for which we use the following visual abbreviations:

## Unreleased

- 🐞 Manually specified configuration files may now reside in the default
location directories. Configuration files can now be symlinked.
[#1248](https://github.com/tenzir/vast/pull/1248)
mavam marked this conversation as resolved.
Show resolved Hide resolved

- 🎁 The new short options `-v`, `-vv`, `-vvv`, `-q`, `-qq`, and `-qqq` map onto
the existing verbosity levels.
[#1244](https://github.com/tenzir/vast/pull&1244)
[#1244](https://github.com/tenzir/vast/pull/1244)

## [2020.12.16]

Expand Down
5 changes: 0 additions & 5 deletions libvast/src/system/configuration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,6 @@ caf::error configuration::parse(int argc, char** argv) {
"cannot find configuration file: " + config.str());
}
}
// Remove all non-existent config files.
config_files.erase(
std::remove_if(config_files.begin(), config_files.end(),
[](auto&& p) { return !p.is_regular_file(); }),
config_files.end());
// Parse and merge all configuration files.
record merged_config;
for (const auto& config : config_files) {
Expand Down