Change rpc and legacy forwarder to take forward filter in the constructor.

2 files changed, 22 insertions, 14 deletions

diff --git a/logd/src/tests/legacy_forwarder/legacy_forwarder_test.cpp b/logd/src/tests/legacy_forwarder/legacy_forwarder_test.cpp
index 83a54a24365..d3339894819 100644
--- a/logd/src/tests/legacy_forwarder/legacy_forwarder_test.cpp
+++ b/logd/src/tests/legacy_forwarder/legacy_forwarder_test.cpp
@@ -27,11 +27,14 @@ struct ForwardFixture {
           logLine(createLogLine())
     {
         fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777);
-        forwarder = LegacyForwarder::to_open_file(m, fd);
     }
     ~ForwardFixture() {
     }
 
+    void make_forwarder(const ForwardMap& forwarder_filter) {
+        forwarder = LegacyForwarder::to_open_file(m, forwarder_filter, fd);
+    }
+
     const std::string createLogLine() {
         FastOS_Time timer;
         timer.SetNow();
@@ -55,16 +58,16 @@ struct ForwardFixture {
 
 
 TEST_F("require that forwarder forwards if set", ForwardFixture("forward.txt")) {
-    ForwardMap forwardMap;
-    forwardMap[Logger::event] = true;
-    f1.forwarder->setForwardMap(forwardMap);
+    ForwardMap forward_filter;
+    forward_filter[Logger::event] = true;
+    f1.make_forwarder(forward_filter);
     f1.verifyForward(true);
 }
 
 TEST_F("require that forwarder does not forward if not set", ForwardFixture("forward.txt")) {
-    ForwardMap forwardMap;
-    forwardMap[Logger::event] = false;
-    f1.forwarder->setForwardMap(forwardMap);
+    ForwardMap forward_filter;
+    forward_filter[Logger::event] = false;
+    f1.make_forwarder(forward_filter);
     f1.verifyForward(false);
 }
 
diff --git a/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp b/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp
index 30ca5e19d44..5b70434e793 100644
--- a/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp
+++ b/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp
@@ -110,6 +110,17 @@ public:
 
 };
 
+ForwardMap
+make_forward_filter()
+{
+    ForwardMap result;
+    result[ns_log::Logger::error] = true;
+    result[ns_log::Logger::warning] = false;
+    result[ns_log::Logger::info] = true;
+    // all other log levels are implicit false
+    return result;
+}
+
 struct RpcForwarderTest : public ::testing::Test {
     RpcServer server;
     std::shared_ptr<MockMetricsManager> metrics_mgr;
@@ -120,14 +131,8 @@ struct RpcForwarderTest : public ::testing::Test {
         : server(),
           metrics_mgr(std::make_shared<MockMetricsManager>()),
           metrics(metrics_mgr),
-          forwarder(metrics, supervisor.get(), "localhost", server.get_listen_port(), 60.0, 3)
+          forwarder(metrics, make_forward_filter(), supervisor.get(), "localhost", server.get_listen_port(), 60.0, 3)
     {
-        ForwardMap forward_filter;
-        forward_filter[ns_log::Logger::error] = true;
-        forward_filter[ns_log::Logger::warning] = false;
-        forward_filter[ns_log::Logger::info] = true;
-        // all other log levels are implicit false
-        forwarder.set_forward_filter(forward_filter);
     }
     void forward_line(const std::string& payload) {
         forwarder.forwardLine(make_log_line("info", payload));