aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-04-24 15:43:42 +0200
committergjoranv <gv@verizonmedia.com>2020-04-25 02:22:56 +0200
commitee9e892838733da49d5ea2b74e456751c05c3f18 (patch)
treecbe13cfe4e3579110c2751826f5701d93134f953 /config-model/src/main/java
parent816e0e5dcd0987e8be4e3ea66402c83b770dd467 (diff)
LogLevel.WARNING -> Level.WARNING
Diffstat (limited to 'config-model/src/main/java')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java4
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java4
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java2
5 files changed, 7 insertions, 7 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java b/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java
index 93f308a2c2e..a392a778709 100644
--- a/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java
+++ b/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java
@@ -124,7 +124,7 @@ public final class XmlHelper {
log.log(Level.FINE, "XML parser now operational!");
return docBuilder;
} catch (ParserConfigurationException e) {
- log.log(LogLevel.WARNING, "No XML parser available - " + e);
+ log.log(Level.WARNING, "No XML parser available - " + e);
return null;
}
}
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 8437df43df9..96dc312abd7 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
@@ -154,7 +154,7 @@ public class RankSetupValidator extends Validator {
private void validateWarn(Exception e, DeployLogger deployLogger) {
String msg = "Unable to execute '"+ binaryName + "', validation of rank expressions will only take place when you start Vespa: " +
Exceptions.toMessageString(e);
- deployLogger.log(LogLevel.WARNING, msg);
+ deployLogger.log(Level.WARNING, msg);
}
private void validateFail(String output, SearchCluster sc, String sdName, DeployLogger deployLogger) {
@@ -171,7 +171,7 @@ public class RankSetupValidator extends Validator {
}
}
if (ignoreValidationErrors) {
- deployLogger.log(LogLevel.WARNING, errMsg.append("(Continuing since ignoreValidationErrors flag is set.)").toString());
+ deployLogger.log(Level.WARNING, errMsg.append("(Continuing since ignoreValidationErrors flag is set.)").toString());
} else {
throw new IllegalArgumentException(errMsg.toString());
}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
index 00549cc3a99..be85861ddb6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
@@ -40,13 +40,13 @@ public class UserConfigBuilder {
Optional<ConfigDefinition> def = configDefinitionStore.getConfigDefinition(key);
if ( ! def.isPresent()) { // TODO: Fail instead of warn
- logger.log(LogLevel.WARNING, "Unable to find config definition '" + key.asFileName() +
+ logger.log(Level.WARNING, "Unable to find config definition '" + key.asFileName() +
"'. Please ensure that the name is spelled correctly, and that the def file is included in a bundle.");
}
ConfigPayloadBuilder payloadBuilder = new DomConfigPayloadBuilder(def.orElse(null)).build(element);
ConfigPayloadBuilder old = builderMap.get(key);
if (old != null) {
- logger.log(LogLevel.WARNING, "Multiple overrides for " + key + " found. Applying in the order they are discovered");
+ logger.log(Level.WARNING, "Multiple overrides for " + key + " found. Applying in the order they are discovered");
old.override(payloadBuilder);
} else {
builderMap.put(key, payloadBuilder);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java
index 1afb3abe90f..706311dcdbf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java
@@ -53,7 +53,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase {
addLogForwarders(adminElement.child("logforwarding"), admin);
if (adminElement.child("filedistribution") != null) {
- deployState.getDeployLogger().log(LogLevel.WARNING, "'filedistribution' element is deprecated and ignored");
+ deployState.getDeployLogger().log(Level.WARNING, "'filedistribution' element is deprecated and ignored");
}
}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
index 901d81927a5..6e6a4d5ac8f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
@@ -84,7 +84,7 @@ public class FileSender implements Serializable {
ConfigDefinition configDefinition = builder.getConfigDefinition();
if (configDefinition == null) {
// TODO: throw new IllegalArgumentException("Not able to find config definition for " + builder);
- logger.log(LogLevel.WARNING, "Not able to find config definition for " + key + ". Will not send files for this config");
+ logger.log(Level.WARNING, "Not able to find config definition for " + key + ". Will not send files for this config");
return;
}
// Inspect fields at this level