mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-05 08:25:16 +00:00
Code Issues Releases Wiki Activity

[#665,!460] Updated following preliminary review

Browse Source 
doc/examples/kea4/all-keys-current.json
    Added pattern

doc/sphinx/arm/logging.rst
    Revamped a bit

src/lib/process/tests/log_parser_unittests.cc
    Updated to test pattern parsing
This commit is contained in:
Thomas Markwalder
2019-08-08 10:07:08 -04:00
committed by Tomek Mrugalski
parent 007e866a79
commit e91372f274
3 changed files with 176 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/lib/process/tests/log_parser_unittests.cc
View File

@@ -201,6 +201,9 @@ TEST_F(LoggingTest, parsingFile) {
EXPECT_EQ("logfile.txt" , storage->getLoggingInfo()[0].destinations_[0].output_);
// Default for immediate flush is true
EXPECT_TRUE(storage->getLoggingInfo()[0].destinations_[0].flush_);
// Pattern should default to empty string.
EXPECT_TRUE(storage->getLoggingInfo()[0].destinations_[0].pattern_.empty());
}
// Checks if the LogConfigParser class is able to transform data structures
@@ -370,6 +373,84 @@ TEST_F(LoggingTest, logRotate) {
wipeFiles();
}
// Verifies that a valid output option,'pattern' paress correctly.
TEST_F(LoggingTest, validPattern) {
const char* config_txt =
"{ \"loggers\": ["
" {"
" \"name\": \"kea\","
" \"output_options\": ["
" {"
" \"output\": \"stdout\","
" \"pattern\": \"mylog %m\n\""
" }"
" ],"
" \"severity\": \"INFO\""
" }"
"]}";
ConfigPtr storage(new ConfigBase());
LogConfigParser parser(storage);
// We need to parse properly formed JSON and then extract
// "loggers" element from it. For some reason fromJSON is
// throwing at opening square bracket
ConstElementPtr config = Element::fromJSON(config_txt);
config = config->get("loggers");
EXPECT_NO_THROW(parser.parseConfiguration(config));
ASSERT_EQ(1, storage->getLoggingInfo().size());
EXPECT_EQ("kea", storage->getLoggingInfo()[0].name_);
EXPECT_EQ(isc::log::INFO, storage->getLoggingInfo()[0].severity_);
ASSERT_EQ(1, storage->getLoggingInfo()[0].destinations_.size());
EXPECT_EQ("stdout" , storage->getLoggingInfo()[0].destinations_[0].output_);
EXPECT_EQ(storage->getLoggingInfo()[0].destinations_[0].pattern_,
std::string("mylog %m\n"));
}
// Verifies that output option,'pattern', may be an empty string
TEST_F(LoggingTest, emptyPattern) {
const char* config_txt =
"{ \"loggers\": ["
" {"
" \"name\": \"kea\","
" \"output_options\": ["
" {"
" \"output\": \"stdout\","
" \"pattern\": \"\""
" }"
" ],"
" \"severity\": \"INFO\""
" }"
"]}";
ConfigPtr storage(new ConfigBase());
LogConfigParser parser(storage);
// We need to parse properly formed JSON and then extract
// "loggers" element from it. For some reason fromJSON is
// throwing at opening square bracket
ConstElementPtr config = Element::fromJSON(config_txt);
config = config->get("loggers");
EXPECT_NO_THROW(parser.parseConfiguration(config));
ASSERT_EQ(1, storage->getLoggingInfo().size());
EXPECT_EQ("kea", storage->getLoggingInfo()[0].name_);
EXPECT_EQ(isc::log::INFO, storage->getLoggingInfo()[0].severity_);
ASSERT_EQ(1, storage->getLoggingInfo()[0].destinations_.size());
EXPECT_EQ("stdout" , storage->getLoggingInfo()[0].destinations_[0].output_);
EXPECT_TRUE(storage->getLoggingInfo()[0].destinations_[0].pattern_.empty());
}
/// @todo Add tests for malformed logging configuration
/// @todo There is no easy way to test applyConfiguration() and defaultLogging().