From fb5f3e7a2e66787394cfdcf7f08b9622a2d32c68 Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Tue, 9 Apr 2019 08:42:23 +0000 Subject: Setup forwarder to dev/null if logserver should not be used (also if use rpc is on). --- logd/src/logd/config_subscriber.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'logd') 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 ConfigSubscriber::make_forwarder(Metrics& metrics) { std::unique_ptr result; - if (_logserver_use_rpc) { - result = std::make_unique(metrics, _forward_filter, _supervisor, _logserver_host, - _logserver_rpc_port, 60.0, 100); + if (_use_logserver) { + if (_logserver_use_rpc) { + result = std::make_unique(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; -- cgit v1.2.3