Skip to content

Support inline sink patterns #7

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
mattkdab wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support inline sink patterns #7

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
2 changes: 1 addition & 1 deletion src/KDSpdSetup/kdspdsetup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ void setupFrom(std::string const &file)
{
auto const data = toml::parse(file);

setup::setupSinks(data);
setup::setupPatterns(data);
setup::setupSinks(data);
setup::setupThreadPools(data);
setup::setupLoggers(data);
}
Expand Down
14 changes: 14 additions & 0 deletions src/KDSpdSetup/setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,16 @@ void setupSink(toml::table &&sinkTable)
throw std::out_of_range("KDSPDSetup: sink type "s + typeStr.str + " is not valid"s);

toml::string level = "";
toml::string pattern = "";

if (sinkTable.contains("level")) {
level = sinkTable.at("level").as_string();
}

if (sinkTable.contains("pattern")) {
pattern = sinkTable.at("pattern").as_string();
}

if (details::inTypelist(typeStr, details::fileStrs) || details::inTypelist(typeStr, details::rotateStrs) ||
details::inTypelist(typeStr, details::dailyStrs)) {
handleTruncatableSink(std::move(typeStr), std::move(sinkTable), sinkPtr);
Expand Down Expand Up @@ -93,6 +99,14 @@ void setupSink(toml::table &&sinkTable)
sinkPtr->set_level(details::levelMap.at(level));
}

if (pattern != "") {
if (details::SPDMaps::patternMap().contains(pattern)) {
sinkPtr->set_pattern(details::SPDMaps::patternMap().at(pattern));
} else {
sinkPtr->set_pattern(pattern);
}
}

details::SPDMaps::emplaceSinkMap(std::make_pair(name, sinkPtr));
}

Expand Down