diff options
3 files changed, 9 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java index 198f6b88798..04faff688f8 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java @@ -214,7 +214,10 @@ public class RankSetupValidator extends Validator { if (line.startsWith("debug\t")) continue; try { LogMessage logMessage = LogMessage.parseNativeFormat(line); - message.append(logMessage.getLevel()).append(": ").append(logMessage.getPayload()).append("\n"); + message.append(logMessage.getLevel()) + .append(": ") + .append(logMessage.getPayload().replace("\\n", "\n\t")) + .append("\n"); } catch (InvalidLogFormatException e) { message.append(line).append("\n"); } diff --git a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp index 50c089ce8dc..86097e8872a 100644 --- a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp +++ b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp @@ -110,7 +110,7 @@ TEST_F("verify too deep dependency graph", RankFixture) { " ... needed by rank feature chain(basic,253,4)\n" " ... needed by rank feature chain(basic,254,4)\n" " ... needed by rank feature chain(basic,255,4)\n" - " ... needed by rank feature chain(basic,256,4)\n"}}, + " ... needed by rank feature chain(basic,256,4)"}}, {regex, {Level::WARNING, "high stack usage: [0-9]+ bytes"}}, {equal, {Level::ERROR, "verification failed: rank feature chain(basic, 256, 4) (feature verification test)"}}})); } @@ -123,7 +123,7 @@ TEST_F("verify dependency cycle", RankFixture) { " ... needed by rank feature chain(cycle,1,2)\n" " ... needed by rank feature chain(cycle,2,2)\n" " ... needed by rank feature chain(cycle,3,2)\n" - " ... needed by rank feature chain(cycle,4,2)\n"}}, + " ... needed by rank feature chain(cycle,4,2)"}}, {equal, {Level::ERROR, "verification failed: rank feature chain(cycle, 4, 2) (feature verification test)"}}})); } diff --git a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp index cc2cae1c8cb..eb1876da45c 100644 --- a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp +++ b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp @@ -139,6 +139,9 @@ struct Compiler : public Blueprint::DependencyHandler { } else { msg = fmt("invalid %s: %s\n%s", describe(feature_name).c_str(), reason.c_str(), trace.c_str()); } + if (msg.rbegin()[0] == '\n') { + msg.pop_back(); + } errors.emplace_back(msg); } probe_stack(); |