diff options
author | Geir Storli <geirst@verizonmedia.com> | 2019-03-21 14:08:39 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2019-03-21 14:08:39 +0000 |
commit | 22af1049211b69490223aeec835d2aa6f052d564 (patch) | |
tree | cac10ead0db7b5a447e4f79a26b215c57f3328f7 /logd | |
parent | 40f7f32cda15d3d144975546169c1bcf0e4f78ae (diff) |
Rename Forwarder -> LegacyForwarder in preparation for something new and better.
Diffstat (limited to 'logd')
-rw-r--r-- | logd/CMakeLists.txt | 2 | ||||
-rw-r--r-- | logd/src/apps/logd/main.cpp | 4 | ||||
-rw-r--r-- | logd/src/logd/CMakeLists.txt | 2 | ||||
-rw-r--r-- | logd/src/logd/config_subscriber.cpp | 4 | ||||
-rw-r--r-- | logd/src/logd/config_subscriber.h | 6 | ||||
-rw-r--r-- | logd/src/logd/legacy_forwarder.cpp (renamed from logd/src/logd/forwarder.cpp) | 14 | ||||
-rw-r--r-- | logd/src/logd/legacy_forwarder.h (renamed from logd/src/logd/forwarder.h) | 6 | ||||
-rw-r--r-- | logd/src/logd/watcher.cpp | 4 | ||||
-rw-r--r-- | logd/src/logd/watcher.h | 6 | ||||
-rw-r--r-- | logd/src/tests/forwarder/CMakeLists.txt | 8 | ||||
-rw-r--r-- | logd/src/tests/legacy_forwarder/.gitignore (renamed from logd/src/tests/forwarder/.gitignore) | 0 | ||||
-rw-r--r-- | logd/src/tests/legacy_forwarder/CMakeLists.txt | 8 | ||||
-rw-r--r-- | logd/src/tests/legacy_forwarder/legacy_forwarder_test.cpp (renamed from logd/src/tests/forwarder/forwarder_test.cpp) | 10 |
13 files changed, 37 insertions, 37 deletions
diff --git a/logd/CMakeLists.txt b/logd/CMakeLists.txt index 25beef08dd0..85aebac365b 100644 --- a/logd/CMakeLists.txt +++ b/logd/CMakeLists.txt @@ -14,7 +14,7 @@ vespa_define_module( src/logd TESTS - src/tests/forwarder + src/tests/legacy_forwarder src/tests/rotate ) diff --git a/logd/src/apps/logd/main.cpp b/logd/src/apps/logd/main.cpp index 86198eadf09..229f385d416 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/exceptions.h> -#include <logd/forwarder.h> +#include <logd/legacy_forwarder.h> #include <logd/metrics.h> #include <logd/state_reporter.h> #include <logd/watcher.h> @@ -21,7 +21,7 @@ int main(int, char**) { StateReporter stateReporter; Metrics metrics(stateReporter.metrics()); - Forwarder fwd(metrics); + LegacyForwarder fwd(metrics); EV_STARTED("logdemon"); diff --git a/logd/src/logd/CMakeLists.txt b/logd/src/logd/CMakeLists.txt index 717000f4f7a..2d40447074e 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 - forwarder.cpp + legacy_forwarder.cpp metrics.cpp state_reporter.cpp watcher.cpp diff --git a/logd/src/logd/config_subscriber.cpp b/logd/src/logd/config_subscriber.cpp index 4272d149375..33d662a6ca2 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 "forwarder.h" +#include "legacy_forwarder.h" #include <fcntl.h> #include <unistd.h> @@ -133,7 +133,7 @@ ConfigSubscriber::closeConn() _needToConnect = true; } -ConfigSubscriber::ConfigSubscriber(Forwarder &fw, const config::ConfigUri & configUri) +ConfigSubscriber::ConfigSubscriber(LegacyForwarder &fw, const config::ConfigUri &configUri) : _logServer(), _logPort(0), _logserverfd(-1), diff --git a/logd/src/logd/config_subscriber.h b/logd/src/logd/config_subscriber.h index bedf10bd111..1650e46a17a 100644 --- a/logd/src/logd/config_subscriber.h +++ b/logd/src/logd/config_subscriber.h @@ -6,7 +6,7 @@ namespace logdemon { -class Forwarder; +class LegacyForwarder; /** * Class used to subscribe for logd config. @@ -22,7 +22,7 @@ private: int _remove_meg; int _remove_age; bool _use_logserver; - Forwarder& _fw; + LegacyForwarder& _fw; config::ConfigSubscriber _subscriber; config::ConfigHandle<cloud::config::log::LogdConfig>::UP _handle; bool _hasAvailable; @@ -37,7 +37,7 @@ public: void closeConn(); ConfigSubscriber(const ConfigSubscriber& other) = delete; ConfigSubscriber& operator=(const ConfigSubscriber& other) = delete; - ConfigSubscriber(Forwarder &fw, const config::ConfigUri & configUri); + ConfigSubscriber(LegacyForwarder &fw, const config::ConfigUri &configUri); ~ConfigSubscriber(); int getStatePort() const { return _statePort; } diff --git a/logd/src/logd/forwarder.cpp b/logd/src/logd/legacy_forwarder.cpp index 76b917d9782..b512bab7fb6 100644 --- a/logd/src/logd/forwarder.cpp +++ b/logd/src/logd/legacy_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 "exceptions.h" -#include "forwarder.h" +#include "legacy_forwarder.h" #include "metrics.h" #include <vespa/vespalib/component/vtag.h> #include <vespa/vespalib/locale/c.h> @@ -14,17 +14,17 @@ using LogLevel = ns_log::Logger::LogLevel; namespace logdemon { -Forwarder::Forwarder(Metrics &metrics) +LegacyForwarder::LegacyForwarder(Metrics &metrics) : _logserverfd(-1), _metrics(metrics), _forwardMap(), _levelparser(), _badLines(0) {} -Forwarder::~Forwarder() = default; +LegacyForwarder::~LegacyForwarder() = default; void -Forwarder::forwardText(const char *text, int len) +LegacyForwarder::forwardText(const char *text, int len) { int wsize = write(_logserverfd, text, len); @@ -40,7 +40,7 @@ Forwarder::forwardText(const char *text, int len) } void -Forwarder::sendMode() +LegacyForwarder::sendMode() { char buf[1024]; snprintf(buf, 1024, "mode logd %s\n", vespalib::VersionTag); @@ -53,7 +53,7 @@ Forwarder::sendMode() } void -Forwarder::forwardLine(const char *line, const char *eol) +LegacyForwarder::forwardLine(const char *line, const char *eol) { int linelen = eol - line; @@ -68,7 +68,7 @@ Forwarder::forwardLine(const char *line, const char *eol) } bool -Forwarder::parseline(const char *linestart, const char *lineend) +LegacyForwarder::parseline(const char *linestart, const char *lineend) { int llength = lineend - linestart; diff --git a/logd/src/logd/forwarder.h b/logd/src/logd/legacy_forwarder.h index b5c57fea8cd..7852219d9f0 100644 --- a/logd/src/logd/forwarder.h +++ b/logd/src/logd/legacy_forwarder.h @@ -25,7 +25,7 @@ public: /** * Class used to forward log lines to the logserver via a one-way text protocol. */ -class Forwarder +class LegacyForwarder { private: int _logserverfd; @@ -42,8 +42,8 @@ private: } bool parseline(const char *linestart, const char *lineend); public: - Forwarder(Metrics &metrics); - ~Forwarder(); + LegacyForwarder(Metrics &metrics); + ~LegacyForwarder(); void forwardText(const char *text, int len); void forwardLine(const char *line, const char *eol); void setForwardMap(const ForwardMap & forwardMap) { _forwardMap = forwardMap; } diff --git a/logd/src/logd/watcher.cpp b/logd/src/logd/watcher.cpp index a8264328b2c..765e338fa72 100644 --- a/logd/src/logd/watcher.cpp +++ b/logd/src/logd/watcher.cpp @@ -2,7 +2,7 @@ #include "config_subscriber.h" #include "exceptions.h" -#include "forwarder.h" +#include "legacy_forwarder.h" #include "watcher.h" #include <vespa/vespalib/util/sig_catch.h> #include <fcntl.h> @@ -59,7 +59,7 @@ constexpr size_t G_BUFSIZE = 1024*1024; } // namespace logdemon::<unnamed> -Watcher::Watcher(ConfigSubscriber &cfs, Forwarder &fw) +Watcher::Watcher(ConfigSubscriber &cfs, LegacyForwarder &fw) : _buffer(G_BUFSIZE), _confsubscriber(cfs), _forwarder(fw), diff --git a/logd/src/logd/watcher.h b/logd/src/logd/watcher.h index 2629da040f7..cd4d9947fd8 100644 --- a/logd/src/logd/watcher.h +++ b/logd/src/logd/watcher.h @@ -5,7 +5,7 @@ namespace logdemon { -class Forwarder; +class LegacyForwarder; class ConfigSubscriber; /** @@ -16,14 +16,14 @@ class Watcher private: std::vector<char> _buffer; ConfigSubscriber & _confsubscriber; - Forwarder & _forwarder; + LegacyForwarder & _forwarder; int _wfd; char * getBuf() { return &_buffer[0]; } long getBufSize() const { return _buffer.size(); } public: Watcher(const Watcher& other) = delete; Watcher& operator=(const Watcher& other) = delete; - Watcher(ConfigSubscriber &cfs, Forwarder &fw); + Watcher(ConfigSubscriber &cfs, LegacyForwarder &fw); ~Watcher(); void watchfile(); 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); |