diff options
| author | Jon Bratseth <bratseth@oath.com> | 2019-04-02 15:03:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-02 15:03:27 +0200 |
| commit | 6ad65a6ce0b7e56cde45a61db3dfb6314d9e8caf (patch) | |
| tree | 86741360c720367644dac01b70985267b5c3c8d8 /configserver | |
| parent | 67f18277a9d68bb35bca00e25b38378495bcdd6a (diff) | |
| parent | 79d41d1d168220c47d1056a7d1db6828602314a5 (diff) | |
Merge pull request #8977 from vespa-engine/bratseth/allow-destructive-changes-in-dev
Allow destructive changes in manually deployed zones
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java index 172d9c025d5..61f5e4f1230 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java @@ -90,11 +90,11 @@ public class RemoteSession extends Session { void makeActive(ReloadHandler reloadHandler) { Curator.CompletionWaiter waiter = zooKeeperClient.getActiveWaiter(); - log.log(LogLevel.DEBUG, logPre() + "Getting session from repo: " + getSessionId()); + log.log(LogLevel.DEBUG, () -> logPre() + "Getting session from repo: " + getSessionId()); ApplicationSet app = ensureApplicationLoaded(); - log.log(LogLevel.DEBUG, logPre() + "Reloading config for " + getSessionId()); + log.log(LogLevel.DEBUG, () -> logPre() + "Reloading config for " + getSessionId()); reloadHandler.reloadConfig(app); - log.log(LogLevel.DEBUG, logPre() + "Notifying " + waiter); + log.log(LogLevel.DEBUG, () -> logPre() + "Notifying " + waiter); notifyCompletion(waiter); log.log(LogLevel.INFO, logPre() + "Session activated: " + getSessionId()); } |