Merge pull request #25579 from vespa-engine/arnej/use-current-target-in-forwarding

simplify: use current target

2 files changed, 6 insertions, 21 deletions

diff --git a/vespalog/src/vespa/log/llparser.cpp b/vespalog/src/vespa/log/llparser.cpp
index 4d0294ca20e..1585b9fde33 100644
--- a/vespalog/src/vespa/log/llparser.cpp
+++ b/vespalog/src/vespa/log/llparser.cpp
@@ -6,6 +6,7 @@
 #include <cstdlib>
 #include <unistd.h>
 #include <sys/time.h>
+#include <cassert>
 #include <vespa/defaults.h>
 
 namespace ns_log {
@@ -18,32 +19,18 @@ LLParser::LLParser()
       _defService(defservice),
       _defComponent(defcomponent),
       _defLevel(Logger::info),
-      _target(LogTarget::defaultTarget()),
+      _target(Logger::getCurrentTarget()),
       _rejectFilter(RejectFilter::createDefaultFilter())
 {
+    assert(_target != nullptr);
     const char *envServ = getenv("VESPA_SERVICE_NAME");
     if (envServ != NULL) {
         _defService = envServ;
     }
-    char *name = getenv("VESPA_LOG_TARGET");
-    if (name) {
-	LogTarget *target;
-        try {
-	    target = LogTarget::makeTarget(name);
-	} catch (InvalidLogException& ex) {
-	    // If we catch an exception, use default target
-	    target = LogTarget::defaultTarget();
-	}
-        delete _target;
-        _target = target;
-    }
     snprintf(_defPid, 10, "%d", (int)getpid());
 }
 
-LLParser::~LLParser()
-{
-    delete _target;
-}
+LLParser::~LLParser() = default;
 
 const char LLParser::_hexdigit[17] = "0123456789abcdef";
 
diff --git a/vespalog/src/vespa/log/llparser.h b/vespalog/src/vespa/log/llparser.h
index 257969e7216..753759b4610 100644
--- a/vespalog/src/vespa/log/llparser.h
+++ b/vespalog/src/vespa/log/llparser.h
@@ -21,18 +21,16 @@ private:
 
     LogTarget *_target;
     RejectFilter _rejectFilter;
-    void makeMessage(Logger::LogLevel l, char *msg);
     void makeMessage(const char *tmf, const char *hsf, const char *pdf,
                      const char *svf, const char *cmf, Logger::LogLevel l,
                      char *msg);
     void sendMessage(const char *msg);
 
-    LLParser(const LLParser &);
-    LLParser& operator = (const LLParser &);
-
 public:
     void doInput(char *line);
     LLParser();
+    LLParser(const LLParser & ) = delete;
+    LLParser& operator = (const LLParser &) = delete;
     ~LLParser();
     void setService(const char *s) { _defService = s; }
     void setComponent(const char *c) { _defComponent = c; }