Merge pull request #6180 from vespa-engine/arnej/use-log-abort

use LOG_ABORT not just abort()

2 files changed, 5 insertions, 2 deletions

diff --git a/config/src/vespa/config/frt/frtconfigresponsev3.cpp b/config/src/vespa/config/frt/frtconfigresponsev3.cpp
index 379ebbd1803..405391d99b6 100644
--- a/config/src/vespa/config/frt/frtconfigresponsev3.cpp
+++ b/config/src/vespa/config/frt/frtconfigresponsev3.cpp
@@ -63,7 +63,7 @@ FRTConfigResponseV3::readConfigValue() const
         if (consumedSize == 0) {
             std::string json(make_json(*payloadData, true));
             LOG(error, "Error decoding JSON. Consumed size: %lu, uncompressed size: %u, compression type: %s, assumed uncompressed size(%u), compressed size: %u, slime(%s)", consumedSize, data.size, compressionTypeToString(info.compressionType).c_str(), info.uncompressedSize, ((*_returnValues)[1]._data._len), json.c_str());
-            assert(false);
+            LOG_ABORT("Error decoding JSON");
         }
     }
     if (LOG_WOULD_LOG(spam)) {
diff --git a/config/src/vespa/config/print/fileconfigformatter.cpp b/config/src/vespa/config/print/fileconfigformatter.cpp
index 507e1440bae..e4071474760 100644
--- a/config/src/vespa/config/print/fileconfigformatter.cpp
+++ b/config/src/vespa/config/print/fileconfigformatter.cpp
@@ -7,6 +7,9 @@
 #include <cmath>
 #include <vector>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".config.print.fileconfigformatter");
+
 using namespace vespalib::slime::convenience;
 
 using vespalib::slime::ArrayTraverser;
@@ -128,7 +131,7 @@ struct ConfigEncoder : public ArrayTraverser,
         case vespalib::slime::OBJECT::ID: return encodeOBJECT(inspector);
         case vespalib::slime::NIX::ID: return;
         }
-        abort(); // should not be reached
+        LOG_ABORT("should not be reached"); // should not be reached
     }
     void entry(size_t idx, const Inspector &inspector) override;
     void field(const Memory &symbol_name, const Inspector &inspector) override;