summaryrefslogtreecommitdiffstats
path: root/config-application-package
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-application-package
parent4e6825b47270804a36e7d76b873ca6c2fe360eac (diff)
LogLevel.DEBUG -> Level.FINE
Diffstat (limited to 'config-application-package')
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java2
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java8
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java4
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidators.java10
4 files changed, 12 insertions, 12 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
index 02862207e53..6a946e1ce75 100644
--- a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
+++ b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
@@ -54,7 +54,7 @@ class OverrideProcessor implements PreProcessor {
}
public Document process(Document input) throws TransformerException {
- log.log(LogLevel.DEBUG, "Preprocessing overrides with " + environment + "." + region);
+ log.log(Level.FINE, "Preprocessing overrides with " + environment + "." + region);
Document ret = Xml.copyDocument(input);
Element root = ret.getDocumentElement();
applyOverrides(root, Context.empty());
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java
index 521bc141b2b..31349967462 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java
@@ -41,7 +41,7 @@ public class FilesApplicationFile extends ApplicationFile {
@Override
public ApplicationFile delete() {
- log.log(LogLevel.DEBUG, "Delete " + file);
+ log.log(Level.FINE, "Delete " + file);
if (file.isDirectory() && !listFiles().isEmpty()) {
throw new RuntimeException("files. Can't delete, directory not empty: " + this + "(" + listFiles() + ")." + listFiles().size());
}
@@ -154,7 +154,7 @@ public class FilesApplicationFile extends ApplicationFile {
private void writeMetaFile(String data, String status) throws IOException {
File metaDir = createMetaDir();
- log.log(LogLevel.DEBUG, "meta dir=" + metaDir);
+ log.log(Level.FINE, "meta dir=" + metaDir);
File metaFile = new File(metaDir + "/" + getPath().getName());
if (status == null) {
status = ApplicationFile.ContentStatusNew;
@@ -174,7 +174,7 @@ public class FilesApplicationFile extends ApplicationFile {
private File createMetaDir() {
File metaDir = getMetaDir();
if (!metaDir.exists()) {
- log.log(LogLevel.DEBUG, "Creating meta dir " + metaDir);
+ log.log(Level.FINE, "Creating meta dir " + metaDir);
metaDir.mkdirs();
}
return metaDir;
@@ -188,7 +188,7 @@ public class FilesApplicationFile extends ApplicationFile {
public MetaData getMetaData() {
File metaDir = getMetaDir();
File metaFile = new File(metaDir + "/" + getPath().getName());
- log.log(LogLevel.DEBUG, "Getting metadata for " + metaFile);
+ log.log(Level.FINE, "Getting metadata for " + metaFile);
if (metaFile.exists()) {
try {
return mapper.readValue(metaFile, MetaData.class);
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
index c2ad0817de5..79bf3f12649 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
@@ -282,7 +282,7 @@ public class FilesApplicationPackage implements ApplicationPackage {
String dir = include.getAttribute(IncludeDirs.DIR);
validateIncludeDir(dir);
IncludeDirs.validateFilesInIncludedDir(dir, include.getParentNode(), this);
- log.log(LogLevel.DEBUG, "Adding user include dir '" + dir + "'");
+ log.log(Level.FINE, "Adding user include dir '" + dir + "'");
userIncludeDirs.add(dir);
}
@@ -458,7 +458,7 @@ public class FilesApplicationPackage implements ApplicationPackage {
private void addAllDefsFromConfigDir(Map<ConfigDefinitionKey, UnparsedConfigDefinition> defs, File configDefsDir) {
if (! configDefsDir.isDirectory()) return;
- log.log(LogLevel.DEBUG, "Getting all config definitions from '" + configDefsDir + "'");
+ log.log(Level.FINE, "Getting all config definitions from '" + configDefsDir + "'");
for (File def : configDefsDir.listFiles((File dir, String name) -> name.matches(".*\\.def"))) {
String[] nv = def.getName().split("\\.def");
ConfigDefinitionKey key;
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidators.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidators.java
index 23fe0109871..28f74b4adc0 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidators.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidators.java
@@ -110,10 +110,10 @@ public class SchemaValidators {
if (uris == null) throw new IllegalArgumentException("Could not find XML schemas ");
File tmpDir = createTempDirectory(tmpBase.toPath(), "vespa").toFile();
- log.log(LogLevel.DEBUG, "Will save all XML schemas for " + vespaVersion + " to " + tmpDir);
+ log.log(Level.FINE, "Will save all XML schemas for " + vespaVersion + " to " + tmpDir);
while (uris.hasMoreElements()) {
URL u = uris.nextElement();
- log.log(LogLevel.DEBUG, "uri for resource 'schema'=" + u.toString());
+ log.log(Level.FINE, "uri for resource 'schema'=" + u.toString());
// TODO: When is this the case? Remove?
if ("jar".equals(u.getProtocol())) {
JarURLConnection jarConnection = (JarURLConnection) u.openConnection();
@@ -127,7 +127,7 @@ public class SchemaValidators {
jarFile.close();
} else if ("bundle".equals(u.getProtocol())) {
Bundle bundle = getBundle(schemaValidatorClass);
- log.log(LogLevel.DEBUG, "bundle=" + bundle);
+ log.log(Level.FINE, "bundle=" + bundle);
// TODO: Hack to handle cases where bundle=null (which seems to always be the case with config-model-fat-amended.jar)
if (bundle == null) {
String pathPrefix = getDefaults().underVespaHome("share/vespa/schema/");
@@ -135,10 +135,10 @@ public class SchemaValidators {
// Fallback to path without version if path with version does not exist
if (! schemaPath.exists())
schemaPath = new File(pathPrefix);
- log.log(LogLevel.DEBUG, "Using schemas found in " + schemaPath);
+ log.log(Level.FINE, "Using schemas found in " + schemaPath);
copySchemas(schemaPath, tmpDir);
} else {
- log.log(LogLevel.DEBUG, String.format("Saving schemas for model bundle %s:%s", bundle.getSymbolicName(), bundle
+ log.log(Level.FINE, String.format("Saving schemas for model bundle %s:%s", bundle.getSymbolicName(), bundle
.getVersion()));
for (Enumeration<URL> entries = bundle.findEntries("schema", "*.rnc", true);
entries.hasMoreElements(); ) {