diff options
author | Geir Storli <geirst@verizonmedia.com> | 2019-03-20 14:22:21 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2019-03-20 14:22:21 +0000 |
commit | 645ae17b6d20cfc0de4ada3fb3732b5a6f1b897f (patch) | |
tree | 0b44bb3972519f39a99ca514e2fefa226a3b2184 /logd | |
parent | e569d802cd526c83dd01e09ae3d13976d3b6a26f (diff) |
Rename forward* -> forwarder*.
Diffstat (limited to 'logd')
-rw-r--r-- | logd/CMakeLists.txt | 2 | ||||
-rw-r--r-- | logd/src/apps/logd/main.cpp | 2 | ||||
-rw-r--r-- | logd/src/logd/CMakeLists.txt | 2 | ||||
-rw-r--r-- | logd/src/logd/config_subscriber.cpp | 2 | ||||
-rw-r--r-- | logd/src/logd/forwarder.cpp (renamed from logd/src/logd/forward.cpp) | 2 | ||||
-rw-r--r-- | logd/src/logd/forwarder.h (renamed from logd/src/logd/forward.h) | 3 | ||||
-rw-r--r-- | logd/src/logd/watch.cpp | 2 | ||||
-rw-r--r-- | logd/src/tests/forwarder/.gitignore (renamed from logd/src/tests/forward/.gitignore) | 0 | ||||
-rw-r--r-- | logd/src/tests/forwarder/CMakeLists.txt (renamed from logd/src/tests/forward/CMakeLists.txt) | 6 | ||||
-rw-r--r-- | logd/src/tests/forwarder/forwarder_test.cpp (renamed from logd/src/tests/forward/forward.cpp) | 10 |
10 files changed, 17 insertions, 14 deletions
diff --git a/logd/CMakeLists.txt b/logd/CMakeLists.txt index 6a8296564a3..ad7bcdddeba 100644 --- a/logd/CMakeLists.txt +++ b/logd/CMakeLists.txt @@ -14,7 +14,7 @@ vespa_define_module( src/logd TESTS - src/tests/forward + src/tests/forwarder src/tests/info src/tests/rotate ) diff --git a/logd/src/apps/logd/main.cpp b/logd/src/apps/logd/main.cpp index 1967c0d7fc7..09898e64ab8 100644 --- a/logd/src/apps/logd/main.cpp +++ b/logd/src/apps/logd/main.cpp @@ -2,7 +2,7 @@ #include <logd/config_subscriber.h> #include <logd/errhandle.h> -#include <logd/forward.h> +#include <logd/forwarder.h> #include <logd/metrics.h> #include <logd/state.h> #include <logd/watch.h> diff --git a/logd/src/logd/CMakeLists.txt b/logd/src/logd/CMakeLists.txt index 06f0e112d67..d34b7dad2e5 100644 --- a/logd/src/logd/CMakeLists.txt +++ b/logd/src/logd/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_library(logd STATIC SOURCES config_subscriber.cpp conn.cpp - forward.cpp + forwarder.cpp metrics.cpp state.cpp watch.cpp diff --git a/logd/src/logd/config_subscriber.cpp b/logd/src/logd/config_subscriber.cpp index 18eb1b1130f..4272d149375 100644 --- a/logd/src/logd/config_subscriber.cpp +++ b/logd/src/logd/config_subscriber.cpp @@ -2,7 +2,7 @@ #include "config_subscriber.h" #include "conn.h" -#include "forward.h" +#include "forwarder.h" #include <fcntl.h> #include <unistd.h> diff --git a/logd/src/logd/forward.cpp b/logd/src/logd/forwarder.cpp index 4b666ef261e..57097a5b900 100644 --- a/logd/src/logd/forward.cpp +++ b/logd/src/logd/forwarder.cpp @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "forward.h" #include "errhandle.h" +#include "forwarder.h" #include "metrics.h" #include <vespa/vespalib/component/vtag.h> #include <vespa/vespalib/locale/c.h> diff --git a/logd/src/logd/forward.h b/logd/src/logd/forwarder.h index d9a81098ac7..59c8fcb933f 100644 --- a/logd/src/logd/forward.h +++ b/logd/src/logd/forwarder.h @@ -22,6 +22,9 @@ public: LevelParser() : _seenLevelMap() {} }; +/** + * Class used to forward log lines to the logserver via a one-way text protocol. + */ class Forwarder { private: diff --git a/logd/src/logd/watch.cpp b/logd/src/logd/watch.cpp index 6c335b2349c..0f567fa38f8 100644 --- a/logd/src/logd/watch.cpp +++ b/logd/src/logd/watch.cpp @@ -2,7 +2,7 @@ #include "config_subscriber.h" #include "errhandle.h" -#include "forward.h" +#include "forwarder.h" #include "watch.h" #include <vespa/vespalib/util/sig_catch.h> #include <fcntl.h> diff --git a/logd/src/tests/forward/.gitignore b/logd/src/tests/forwarder/.gitignore index a6c6ba525b6..a6c6ba525b6 100644 --- a/logd/src/tests/forward/.gitignore +++ b/logd/src/tests/forwarder/.gitignore diff --git a/logd/src/tests/forward/CMakeLists.txt b/logd/src/tests/forwarder/CMakeLists.txt index 414aaf6e474..94fd62f5cae 100644 --- a/logd/src/tests/forward/CMakeLists.txt +++ b/logd/src/tests/forwarder/CMakeLists.txt @@ -1,8 +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_forward_test_app TEST +vespa_add_executable(logd_forwarder_test_app TEST SOURCES - forward.cpp + forwarder_test.cpp DEPENDS logd ) -vespa_add_test(NAME logd_forward_test_app COMMAND logd_forward_test_app) +vespa_add_test(NAME logd_forwarder_test_app COMMAND logd_forwarder_test_app) diff --git a/logd/src/tests/forward/forward.cpp b/logd/src/tests/forwarder/forwarder_test.cpp index 16bea8f27fc..5d8e4a0668c 100644 --- a/logd/src/tests/forward/forward.cpp +++ b/logd/src/tests/forwarder/forwarder_test.cpp @@ -1,12 +1,12 @@ // 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/metrics.h> +#include <vespa/fastos/time.h> #include <vespa/log/log.h> -#include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/metrics/dummy_metrics_manager.h> -#include <vespa/fastos/time.h> -#include <logd/forward.h> -#include <logd/metrics.h> -#include <sstream> +#include <vespa/vespalib/testkit/testapp.h> #include <fcntl.h> +#include <sstream> #include <unistd.h> using ns_log::Logger; |