diff options
author | Geir Storli <geirst@verizonmedia.com> | 2019-04-09 08:42:23 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2019-04-09 08:42:23 +0000 |
commit | fb5f3e7a2e66787394cfdcf7f08b9622a2d32c68 (patch) | |
tree | 28969ad11be2ca71a23f7225a9de6f53ba640ed7 /logd/src | |
parent | c44c2083b1a0f30325e76a6635a1abfb2f1b4b20 (diff) |
Setup forwarder to dev/null if logserver should not be used (also if use rpc is on).
Diffstat (limited to 'logd/src')
-rw-r--r-- | logd/src/logd/config_subscriber.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/logd/src/logd/config_subscriber.cpp b/logd/src/logd/config_subscriber.cpp index 0a88db9772f..4a5bfc8bcb9 100644 --- a/logd/src/logd/config_subscriber.cpp +++ b/logd/src/logd/config_subscriber.cpp @@ -133,13 +133,15 @@ std::unique_ptr<Forwarder> ConfigSubscriber::make_forwarder(Metrics& metrics) { std::unique_ptr<Forwarder> result; - if (_logserver_use_rpc) { - result = std::make_unique<RpcForwarder>(metrics, _forward_filter, _supervisor, _logserver_host, - _logserver_rpc_port, 60.0, 100); + if (_use_logserver) { + if (_logserver_use_rpc) { + result = std::make_unique<RpcForwarder>(metrics, _forward_filter, _supervisor, _logserver_host, + _logserver_rpc_port, 60.0, 100); + } else { + result = LegacyForwarder::to_logserver(metrics, _forward_filter, _logserver_host, _logserver_port); + } } else { - result = _use_logserver ? - LegacyForwarder::to_logserver(metrics, _forward_filter, _logserver_host, _logserver_port) : - LegacyForwarder::to_dev_null(metrics); + LegacyForwarder::to_dev_null(metrics); } _need_new_forwarder = false; return result; |