From d69380cb7713dd5f7f48849a028a7723e7a619bf Mon Sep 17 00:00:00 2001
From: Teddy Reed <teddy@casualhacking.io>
Date: Sun, 21 Feb 2021 15:57:04 -0500
Subject: [PATCH] Initialize TLSLogForwarder before enrollment check (#6958)

---
 plugins/logger/tls_logger.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/logger/tls_logger.cpp b/plugins/logger/tls_logger.cpp
index 258ef766ab9..5ceea7b45f8 100644
--- a/plugins/logger/tls_logger.cpp
+++ b/plugins/logger/tls_logger.cpp
@@ -70,12 +70,6 @@ Status TLSLoggerPlugin::logStatus(const std::vector<StatusLogLine>& log) {
 }
 
 Status TLSLoggerPlugin::setUp() {
-  auto node_key = getNodeKey("tls");
-  if (!FLAGS_disable_enrollment && node_key.size() == 0) {
-    // Could not generate a node key, continue logging to stderr.
-    return Status(1, "No node key, TLS logging disabled.");
-  }
-
   // Start the log forwarding/flushing thread.
   forwarder_ = std::make_shared<TLSLogForwarder>();
   Status s = forwarder_->setUp();
@@ -84,6 +78,12 @@ Status TLSLoggerPlugin::setUp() {
     return s;
   }
 
+  auto node_key = getNodeKey("tls");
+  if (!FLAGS_disable_enrollment && node_key.size() == 0) {
+    // Could not generate a node key, continue logging to stderr.
+    return Status(1, "No node key, TLS logging disabled.");
+  }
+
   Dispatcher::addService(forwarder_);
 
   return Status(0);