Skip to content

Commit

Permalink
Adapt code to new LogFilter struct
Browse files Browse the repository at this point in the history 
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
  • Loading branch information
@LuciaEchevarria99
LuciaEchevarria99 committed Sep 24, 2024
1 parent 36e33f9 commit d82cfde
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 35 deletions.
12 changes: 6 additions & 6 deletions ddsrecorder/src/cpp/user_interface/arguments_configuration.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,9 @@ ProcessReturnCode parse_arguments(
break;

case optionIndex::ACTIVATE_DEBUG:
commandline_args.log_filter[utils::VerbosityKind::Error].set_value("");
commandline_args.log_filter[utils::VerbosityKind::Warning].set_value("DDSRECORDER");
commandline_args.log_filter[utils::VerbosityKind::Info].set_value("DDSRECORDER");
commandline_args.log_filter.error.set_value("");
commandline_args.log_filter.warning.set_value("DDSRECORDER");
commandline_args.log_filter.info.set_value("DDSRECORDER");
commandline_args.log_verbosity = utils::VerbosityKind::Info;
break;

Expand All @@ -261,9 +261,9 @@ ProcessReturnCode parse_arguments(
break;

case optionIndex::LOG_FILTER:
commandline_args.log_filter[utils::VerbosityKind::Error].set_value(opt.arg);
commandline_args.log_filter[utils::VerbosityKind::Warning].set_value(opt.arg);
commandline_args.log_filter[utils::VerbosityKind::Info].set_value(opt.arg);
commandline_args.log_filter.error.set_value(opt.arg);
commandline_args.log_filter.warning.set_value(opt.arg);
commandline_args.log_filter.info.set_value(opt.arg);
break;

case optionIndex::LOG_VERBOSITY:
Expand Down
2 changes: 1 addition & 1 deletion ...s/test/unittest/monitoring/ddsrecorder_status/logging/LogMonitorDdsRecorderStatusTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class LogMonitorDdsRecorderStatusTest : public testing::Test

utils::BaseLogConfiguration log_conf;
log_conf.verbosity = utils::VerbosityKind::Info;
log_conf.filter[utils::VerbosityKind::Info].set_value("MONITOR_DATA");
log_conf.filter.info.set_value("MONITOR_DATA");

utils::Log::SetVerbosity(log_conf.verbosity);

Expand Down
7 changes: 3 additions & 4 deletions ddsrecorder_yaml/src/cpp/recorder/CommandlineArgsRecorder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ namespace yaml {

CommandlineArgsRecorder::CommandlineArgsRecorder()
{
log_filter[utils::VerbosityKind::Info].set_value("DDSRECORDER", utils::FuzzyLevelValues::fuzzy_level_default);
log_filter[utils::VerbosityKind::Warning].set_value("DDSRECORDER",
utils::FuzzyLevelValues::fuzzy_level_default);
log_filter[utils::VerbosityKind::Error].set_value("", utils::FuzzyLevelValues::fuzzy_level_default);
log_filter.info.set_value("DDSRECORDER", utils::FuzzyLevelValues::fuzzy_level_default);
log_filter.warning.set_value("DDSRECORDER", utils::FuzzyLevelValues::fuzzy_level_default);
log_filter.error.set_value("", utils::FuzzyLevelValues::fuzzy_level_default);
}

bool CommandlineArgsRecorder::is_valid(
Expand Down
7 changes: 3 additions & 4 deletions ddsrecorder_yaml/src/cpp/replayer/CommandlineArgsReplayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ namespace yaml {

CommandlineArgsReplayer::CommandlineArgsReplayer()
{
log_filter[utils::VerbosityKind::Info].set_value("DDSREPLAYER", utils::FuzzyLevelValues::fuzzy_level_default);
log_filter[utils::VerbosityKind::Warning].set_value("DDSREPLAYER",
utils::FuzzyLevelValues::fuzzy_level_default);
log_filter[utils::VerbosityKind::Error].set_value("", utils::FuzzyLevelValues::fuzzy_level_default);
log_filter.info.set_value("DDSREPLAYER", utils::FuzzyLevelValues::fuzzy_level_default);
log_filter.warning.set_value("DDSREPLAYER", utils::FuzzyLevelValues::fuzzy_level_default);
log_filter.error.set_value("", utils::FuzzyLevelValues::fuzzy_level_default);
}

bool CommandlineArgsReplayer::is_valid(
Expand Down
22 changes: 8 additions & 14 deletions ddsrecorder_yaml/test/YamlGetConfigurationDdsRecorderReplayerTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ TEST(YamlGetConfigurationDdsRecorderReplayerTest, get_ddsrecorder_configuration_
CommandlineArgsRecorder commandline_args;

// Setting CommandLine arguments as if configured from CommandLine
commandline_args.log_filter[eprosima::utils::VerbosityKind::Warning].set_value("DDSRECORDER|DDSPIPE|DEBUG");
commandline_args.log_filter.warning.set_value("DDSRECORDER|DDSPIPE|DEBUG");

const char* yml_str =
R"(
Expand All @@ -62,14 +62,11 @@ TEST(YamlGetConfigurationDdsRecorderReplayerTest, get_ddsrecorder_configuration_
ASSERT_TRUE(configuration.ddspipe_configuration.log_configuration.is_valid(error_msg));
ASSERT_EQ(configuration.ddspipe_configuration.log_configuration.verbosity.get_value(), utils::VerbosityKind::Info);
ASSERT_EQ(
configuration.ddspipe_configuration.log_configuration.filter[utils::VerbosityKind::Error].get_value(),
"DEBUG");
configuration.ddspipe_configuration.log_configuration.filter.error.get_value(), "DEBUG");
ASSERT_EQ(
configuration.ddspipe_configuration.log_configuration.filter[utils::VerbosityKind::Warning].get_value(),
"DDSRECORDER|DDSPIPE|DEBUG");
configuration.ddspipe_configuration.log_configuration.filter.warning.get_value(), "DDSRECORDER|DDSPIPE|DEBUG");
ASSERT_EQ(
configuration.ddspipe_configuration.log_configuration.filter[utils::VerbosityKind::Info].get_value(),
"DDSRECORDER");
configuration.ddspipe_configuration.log_configuration.filter.info.get_value(), "DDSRECORDER");
}

/**
Expand All @@ -87,7 +84,7 @@ TEST(YamlGetConfigurationDdsRecorderReplayerTest, get_ddsreplayer_configuration_
CommandlineArgsReplayer commandline_args;

// Setting CommandLine arguments as if configured from CommandLine
commandline_args.log_filter[eprosima::utils::VerbosityKind::Warning].set_value("DDSREPLAYER|DDSPIPE|DEBUG");
commandline_args.log_filter.warning.set_value("DDSREPLAYER|DDSPIPE|DEBUG");

const char* yml_str =
R"(
Expand All @@ -109,14 +106,11 @@ TEST(YamlGetConfigurationDdsRecorderReplayerTest, get_ddsreplayer_configuration_
ASSERT_TRUE(configuration.ddspipe_configuration.log_configuration.is_valid(error_msg));
ASSERT_EQ(configuration.ddspipe_configuration.log_configuration.verbosity.get_value(), utils::VerbosityKind::Info);
ASSERT_EQ(
configuration.ddspipe_configuration.log_configuration.filter[utils::VerbosityKind::Error].get_value(),
"DEBUG");
configuration.ddspipe_configuration.log_configuration.filter.error.get_value(), "DEBUG");
ASSERT_EQ(
configuration.ddspipe_configuration.log_configuration.filter[utils::VerbosityKind::Warning].get_value(),
"DDSREPLAYER|DDSPIPE|DEBUG");
configuration.ddspipe_configuration.log_configuration.filter.warning.get_value(), "DDSREPLAYER|DDSPIPE|DEBUG");
ASSERT_EQ(
configuration.ddspipe_configuration.log_configuration.filter[utils::VerbosityKind::Info].get_value(),
"DDSREPLAYER");
configuration.ddspipe_configuration.log_configuration.filter.info.get_value(), "DDSREPLAYER");
}

int main(
Expand Down
12 changes: 6 additions & 6 deletions ddsreplayer/src/cpp/user_interface/arguments_configuration.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,16 +252,16 @@ ProcessReturnCode parse_arguments(
break;

case optionIndex::ACTIVATE_DEBUG:
commandline_args.log_filter[utils::VerbosityKind::Error].set_value("");
commandline_args.log_filter[utils::VerbosityKind::Warning].set_value("DDSREPLAYER");
commandline_args.log_filter[utils::VerbosityKind::Info].set_value("DDSREPLAYER");
commandline_args.log_filter.error.set_value("");
commandline_args.log_filter.warning.set_value("DDSREPLAYER");
commandline_args.log_filter.info.set_value("DDSREPLAYER");
commandline_args.log_verbosity = utils::VerbosityKind::Info;
break;

case optionIndex::LOG_FILTER:
commandline_args.log_filter[utils::VerbosityKind::Error].set_value(opt.arg);
commandline_args.log_filter[utils::VerbosityKind::Warning].set_value(opt.arg);
commandline_args.log_filter[utils::VerbosityKind::Info].set_value(opt.arg);
commandline_args.log_filter.error.set_value(opt.arg);
commandline_args.log_filter.warning.set_value(opt.arg);
commandline_args.log_filter.info.set_value(opt.arg);
break;

case optionIndex::LOG_VERBOSITY:
Expand Down

0 comments on commit d82cfde

Please sign in to comment.