summaryrefslogtreecommitdiffstats
path: root/config-model/src
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-04-24 13:12:46 +0200
committergjoranv <gv@verizonmedia.com>2020-04-25 02:22:55 +0200
commit25f832e613bb6087327c293b527d5445babb4319 (patch)
tree8197a5b331e845bfe91f006d9cfe8bec9a28170f /config-model/src
parent4e6825b47270804a36e7d76b873ca6c2fe360eac (diff)
LogLevel.DEBUG -> Level.FINE
Diffstat (limited to 'config-model/src')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java2
-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/config/model/producer/AbstractConfigProducer.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java12
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java2
7 files changed, 12 insertions, 12 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
index 2925b394c83..454da0d657a 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
@@ -266,7 +266,7 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter
// TODO: Doctoring on the XML is the wrong level for this. We should be able to mark a model as default instead -Jon
private static Element getImplicitAdmin(DeployState deployState) throws IOException, SAXException {
String defaultAdminElement = deployState.isHosted() ? getImplicitAdminV4() : getImplicitAdminV2();
- log.log(LogLevel.DEBUG, "No <admin> defined, using " + defaultAdminElement);
+ log.log(Level.FINE, "No <admin> defined, using " + defaultAdminElement);
return XmlHelper.getDocumentBuilder().parse(new InputSource(new StringReader(defaultAdminElement))).getDocumentElement();
}
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 107908c91db..93f308a2c2e 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
@@ -121,7 +121,7 @@ public final class XmlHelper {
public static synchronized DocumentBuilder getDocumentBuilder() {
try {
DocumentBuilder docBuilder = factory.newDocumentBuilder();
- log.log(LogLevel.DEBUG, "XML parser now operational!");
+ log.log(Level.FINE, "XML parser now operational!");
return docBuilder;
} catch (ParserConfigurationException e) {
log.log(LogLevel.WARNING, "No XML parser available - " + e);
diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
index 43eeb613e6b..fc602ca8dcd 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java
@@ -203,7 +203,7 @@ public abstract class AbstractConfigProducer<CHILD extends AbstractConfigProduce
boolean foundHere = builder.dispatchGetConfig(this);
if (log.isLoggable(LogLevel.DEBUG)) {
- log.log(LogLevel.DEBUG, "cascadeconfig in " + this + ", getting config " +
+ log.log(Level.FINE, "cascadeconfig in " + this + ", getting config " +
builder.getClass().getDeclaringClass().getName() + " for config id '" + configId + "' found here=" + foundHere);
}
found = found || foundHere;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index 058b456fdb8..2a0b8a236bc 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -357,7 +357,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
*/
protected void checkId(String configId) {
if ( ! id2producer.containsKey(configId)) {
- log.log(LogLevel.DEBUG, "Invalid config id: " + configId);
+ log.log(Level.FINE, "Invalid config id: " + configId);
}
}
@@ -382,7 +382,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
private static void populateConfigBuilder(Builder builder, ConfigProducer configProducer) {
boolean found = configProducer.cascadeConfig(builder);
boolean foundOverride = configProducer.addUserConfig(builder);
- log.log(LogLevel.DEBUG, () -> "Trying to get config for " + builder.getClass().getDeclaringClass().getName() +
+ log.log(Level.FINE, () -> "Trying to get config for " + builder.getClass().getDeclaringClass().getName() +
" for config id " + quote(configProducer.getConfigId()) +
", found=" + found + ", foundOverride=" + foundOverride);
@@ -400,7 +400,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
ConfigInstance.Builder builder = resolveToBuilder(configKey);
// TODO: remove if-statement, the builder can never be null.
if (builder != null) {
- log.log(LogLevel.DEBUG, () -> "Found builder for " + configKey);
+ log.log(Level.FINE, () -> "Found builder for " + configKey);
ConfigPayload payload;
InnerCNode innerCNode = targetDef != null ? targetDef.getCNode() : null;
if (builder instanceof GenericConfig.GenericConfigBuilder) {
@@ -429,7 +429,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
private ConfigPayload getConfigFromBuilder(ConfigInstance.Builder builder, InnerCNode targetDef) {
try {
ConfigInstance instance = InstanceResolver.resolveToInstance(builder, targetDef);
- log.log(LogLevel.DEBUG, () -> "getConfigFromBuilder for builder " + builder.getClass().getName() + ", instance=" + instance);
+ log.log(Level.FINE, () -> "getConfigFromBuilder for builder " + builder.getClass().getName() + ", instance=" + instance);
return ConfigPayload.fromInstance(instance);
} catch (ConfigurationRuntimeException e) {
// This can happen in cases where services ask for config that no longer exist before they have been able
@@ -465,12 +465,12 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
final String builderName = fullClassName + "$Builder";
if (classLoader == null) {
classLoader = getClass().getClassLoader();
- log.log(LogLevel.DEBUG, () -> "No producer found to get classloader from for " + fullClassName + ". Using default");
+ log.log(Level.FINE, () -> "No producer found to get classloader from for " + fullClassName + ". Using default");
}
try {
clazz = classLoader.loadClass(builderName);
} catch (ClassNotFoundException e) {
- log.log(LogLevel.DEBUG, () -> "Tried to load " + builderName + ", not found, trying with generic builder");
+ log.log(Level.FINE, () -> "Tried to load " + builderName + ", not found, trying with generic builder");
// TODO: Enable config compiler when configserver is using new API.
// ConfigCompiler compiler = new LazyConfigCompiler(Files.createTempDir());
// return compiler.compile(targetDef.generateClass()).newInstance();
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 71e90686e22..8437df43df9 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
@@ -89,7 +89,7 @@ public class RankSetupValidator extends Validator {
// Give up, don't say same error msg repeatedly
deleteTempDir(tempDir);
}
- log.log(LogLevel.DEBUG, String.format("Validating %s for %s, %s took %s ms",
+ log.log(Level.FINE, String.format("Validating %s for %s, %s took %s ms",
sdName,
searchCluster,
configId,
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 92785e00436..03b09a2bf2d 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
@@ -26,7 +26,7 @@ public class UserConfigBuilder {
if (producerSpec == null) {
log.log(LogLevel.SPAM, "In getUserConfigs. producerSpec is null");
}
- log.log(LogLevel.DEBUG, "getUserConfigs for " + producerSpec);
+ log.log(Level.FINE, "getUserConfigs for " + producerSpec);
for (Element configE : XML.getChildren(producerSpec, "config")) {
buildElement(configE, builderMap, configDefinitionStore, deployLogger);
}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
index 9067df53a91..9ca5904a7c5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
@@ -136,7 +136,7 @@ public class VespaDomBuilder extends VespaModelBuilder {
UserConfigRepo userConfigs = UserConfigBuilder.build(producerSpec, deployState, deployState.getDeployLogger());
// TODO: must be made to work:
//userConfigs.applyWarnings(child);
- log.log(LogLevel.DEBUG, "Adding user configs " + userConfigs + " for " + producerSpec);
+ log.log(Level.FINE, "Adding user configs " + userConfigs + " for " + producerSpec);
child.mergeUserConfigs(userConfigs);
}