diff options
author | Harald Musum <musum@oath.com> | 2017-08-24 08:28:22 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2017-08-24 08:28:22 +0200 |
commit | c4d4348933ab63a8880c8e88097821f0b45cd52b (patch) | |
tree | da17b3aa0de541f3fd758a942e1f36e426ac5b33 /configserver | |
parent | f1376511dc20469576c0e3b2bceac151f9946054 (diff) |
Add application id to log
Diffstat (limited to 'configserver')
3 files changed, 3 insertions, 6 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java index a805d335c2e..bbd1e189e29 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java @@ -6,7 +6,6 @@ import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.config.model.api.HostProvisioner; -import com.yahoo.config.model.api.Model; import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.api.ModelFactory; import com.yahoo.config.model.application.provider.MockFileRegistry; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java index 509a26370ff..cc7a12801d3 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.NoSuchElementException; import java.util.Optional; import java.util.Set; import java.util.logging.Level; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java index 98741c631b1..b2dca075c4f 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.modelfactory; -import com.yahoo.component.Vtag; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.api.ConfigChangeAction; @@ -82,7 +81,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P ApplicationId applicationId, com.yahoo.component.Version wantedNodeVespaVersion, Instant now) { Version modelVersion = modelFactory.getVersion(); - log.log(LogLevel.DEBUG, "Start building model for Vespa version " + modelVersion); + log.log(LogLevel.DEBUG, "Building model " + modelVersion + " for " + applicationId); FileDistributionProvider fileDistributionProvider = fileDistributionFactory.createProvider( context.getServerDBSessionDir(), applicationId); @@ -103,10 +102,10 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P new com.yahoo.component.Version(modelVersion.toString()), wantedNodeVespaVersion); - log.log(LogLevel.DEBUG, "Running createAndValidateModel for Vespa version " + modelVersion); + log.log(LogLevel.DEBUG, "Create and validate model " + modelVersion + " for " + applicationId); ModelCreateResult result = modelFactory.createAndValidateModel(modelContext, params.ignoreValidationErrors()); validateModelHosts(context.getHostValidator(), applicationId, result.getModel()); - log.log(LogLevel.DEBUG, "Done building model for Vespa version " + modelVersion); + log.log(LogLevel.DEBUG, "Done building model " + modelVersion + " for " + applicationId); return new PreparedModelsBuilder.PreparedModelResult(modelVersion, result.getModel(), fileDistributionProvider, result.getConfigChangeActions()); } |