Keep rank setup errors on separate log lines and annotated as warning.

3 files changed, 11 insertions, 18 deletions

diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
index 72076932dd3..621754d1805 100644
--- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
+++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
@@ -253,14 +253,10 @@ VerifyRankSetup::verify(const std::string & configid)
     return ok;
 }
 
-bool
-verifyRankSetup(const char * configId, std::string & messages) {
+std::pair<bool, std::vector<vespalib::string>>
+verifyRankSetup(const char * configId) {
     VerifyRankSetup verifier;
     bool ok = verifier.verify(configId);
-    vespalib::asciistream os;
-    for (const auto & m : verifier.getMessages()) {
-        os << m << "\n";
-    }
-    messages = os.str();
-    return ok;
+
+    return {ok, verifier.getMessages()};
 }
diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.h b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.h
index 981a40b9804..db881a112a4 100644
--- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.h
+++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
-#include <string>
+#include <vespa/vespalib/stllike/string.h>
+#include <vector>
 
-bool verifyRankSetup(const char * configId, std::string & messages);
+std::pair<bool, std::vector<vespalib::string>> verifyRankSetup(const char * configId);
diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup_app.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup_app.cpp
index 5dff78b17a1..e60cc920f3d 100644
--- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup_app.cpp
+++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup_app.cpp
@@ -27,16 +27,12 @@ App::main(int argc, char **argv)
         return usage();
     }
 
-    std::string messages;
-    bool ok = verifyRankSetup(argv[1], messages);
+    auto [ok, messages] = verifyRankSetup(argv[1]);
 
-    if ( ! messages.empty() ) {
-        LOG(info, "%s", messages.c_str());
+    for (const auto & msg : messages) {
+        LOG(warning, "%s", msg.c_str());
     }
-    if (!ok) {
-        return 1;
-    }
-    return 0;
+    return ok ? 0 : 1;
 }
 
 int main(int argc, char **argv) {