Setup forwarder to dev/null if logserver should not be used (also if use rpc is on).

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;