Rename Forwarder -> LegacyForwarder in preparation for something new and better.

4 files changed, 13 insertions, 13 deletions

diff --git a/logd/src/tests/forwarder/CMakeLists.txt b/logd/src/tests/forwarder/CMakeLists.txt
deleted file mode 100644
index 94fd62f5cae..00000000000
--- a/logd/src/tests/forwarder/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(logd_forwarder_test_app TEST
-    SOURCES
-    forwarder_test.cpp
-    DEPENDS
-    logd
-)
-vespa_add_test(NAME logd_forwarder_test_app COMMAND logd_forwarder_test_app)
diff --git a/logd/src/tests/forwarder/.gitignore b/logd/src/tests/legacy_forwarder/.gitignore
index a6c6ba525b6..a6c6ba525b6 100644
--- a/logd/src/tests/forwarder/.gitignore
+++ b/logd/src/tests/legacy_forwarder/.gitignore
diff --git a/logd/src/tests/legacy_forwarder/CMakeLists.txt b/logd/src/tests/legacy_forwarder/CMakeLists.txt
new file mode 100644
index 00000000000..3dba5c76f52
--- /dev/null
+++ b/logd/src/tests/legacy_forwarder/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(logd_legacy_forwarder_test_app TEST
+    SOURCES
+    legacy_forwarder_test.cpp
+    DEPENDS
+    logd
+)
+vespa_add_test(NAME logd_legacy_forwarder_test_app COMMAND logd_legacy_forwarder_test_app)
diff --git a/logd/src/tests/forwarder/forwarder_test.cpp b/logd/src/tests/legacy_forwarder/legacy_forwarder_test.cpp
index 5d8e4a0668c..3af35f9aa09 100644
--- a/logd/src/tests/forwarder/forwarder_test.cpp
+++ b/logd/src/tests/legacy_forwarder/legacy_forwarder_test.cpp
@@ -1,5 +1,5 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <logd/forwarder.h>
+#include <logd/legacy_forwarder.h>
 #include <logd/metrics.h>
 #include <vespa/fastos/time.h>
 #include <vespa/log/log.h>
@@ -13,11 +13,11 @@ using ns_log::Logger;
 using namespace logdemon;
 
 struct ForwardFixture {
-    Forwarder & forwarder;
+    LegacyForwarder &forwarder;
     int fd;
     const std::string fname;
     const std::string logLine;
-    ForwardFixture(Forwarder & fw, const std::string & fileName)
+    ForwardFixture(LegacyForwarder &fw, const std::string &fileName)
         : forwarder(fw),
           fd(-1),
           fname(fileName),
@@ -55,14 +55,14 @@ struct ForwardFixture {
 std::shared_ptr<vespalib::metrics::MetricsManager> dummy = vespalib::metrics::DummyMetricsManager::create();
 Metrics m(dummy);
 
-TEST_FF("require that forwarder forwards if set", Forwarder(m), ForwardFixture(f1, "forward.txt")) {
+TEST_FF("require that forwarder forwards if set", LegacyForwarder(m), ForwardFixture(f1, "forward.txt")) {
     ForwardMap forwardMap;
     forwardMap[Logger::event] = true;
     f1.setForwardMap(forwardMap);
     f2.verifyForward(true);
 }
 
-TEST_FF("require that forwarder does not forward if not set", Forwarder(m), ForwardFixture(f1, "forward.txt")) {
+TEST_FF("require that forwarder does not forward if not set", LegacyForwarder(m), ForwardFixture(f1, "forward.txt")) {
     ForwardMap forwardMap;
     forwardMap[Logger::event] = false;
     f1.setForwardMap(forwardMap);