Skip to content

Commit

Permalink
Merge "Set the log category to empty string and not to "*" so that th…
Browse files Browse the repository at this point in the history
…e sandesh logging category check passes in contrail-vrouter-agent Closes-Bug: #1470237"
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Feb 25, 2016
2 parents 7ae4064 + 86875d4 commit 1088614
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/vnsw/agent/init/agent_param.cc
Expand Up @@ -417,7 +417,7 @@ void AgentParam::ParseDefaultSection() {
}

if (!GetValueFromTree<string>(log_category_, "DEFAULT.log_category")) {
log_category_ = "*";
log_category_ = "";
}

if (optional<bool> log_local_opt =
Expand Down
2 changes: 1 addition & 1 deletion src/vnsw/agent/init/test/test_agent_init.cc
Expand Up @@ -324,7 +324,7 @@ TEST_F(FlowTest, Default_Cmdline_arg2) {
"test-param");
EXPECT_EQ(param.flow_cache_timeout(), flow_timeout);
EXPECT_EQ(param.http_server_port(), http_server_port);
EXPECT_STREQ(param.log_category().c_str(), "*");
EXPECT_STREQ(param.log_category().c_str(), "");
EXPECT_STREQ(param.log_file().c_str(),
Agent::GetInstance()->log_file().c_str());
EXPECT_STREQ(param.log_level().c_str(), "SYS_DEBUG");
Expand Down

0 comments on commit 1088614

Please sign in to comment.