diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-16 00:12:48 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-16 00:12:48 +0100 |
| commit | 8d513a95e02e0e590a4606749e6cedea4a921aab (patch) | |
| tree | 19852b79c17b9215ec2afc7d4ff53176fbd6960f /container-disc | |
| parent | 16fad971625367714bed3574cd8fa53eb7ee259c (diff) | |
Handle all changes in rpc config.
Diffstat (limited to 'container-disc')
| -rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index 6cc922682cb..0c93ccc43b3 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -62,6 +62,7 @@ import java.util.Comparator; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.Phaser; import java.util.logging.Level; @@ -272,8 +273,25 @@ public final class ConfiguredApplication implements Application { if (first(subscriber.config().values()) instanceof QrConfig newConfig) { reconfigure(newConfig.shutdown()); synchronized (this) { - if (qrConfig.rpc().port() != newConfig.rpc().port()) { - log.log(Level.INFO, "Rpc port changed from " + qrConfig.rpc().port() + " to " + newConfig.rpc().port()); + var currRpc = qrConfig.rpc(); + var newRpc = newConfig.rpc(); + boolean reListen = (currRpc.port() != newRpc.port()) || + (currRpc.enabled() != newRpc.enabled()) || + ! Objects.equals(currRpc.host(), newRpc.host()) || + ! Objects.equals(currRpc.slobrokId(), newRpc.slobrokId()); + if (reListen) { + if (currRpc.port() != newRpc.port()) { + log.log(Level.INFO, "Rpc port changed from " + currRpc.port() + " to " + newRpc.port()); + } + if (currRpc.enabled() != newRpc.enabled()) { + log.log(Level.INFO, "Rpc server " + (newRpc.enabled() ? "enabled" : "disabled")); + } + if ( ! Objects.equals(currRpc.host(), newRpc.host())) { + log.log(Level.INFO, "Rpc host changed from " + currRpc.host() + " to " + newRpc.host()); + } + if ( ! Objects.equals(currRpc.slobrokId(), newRpc.slobrokId())) { + log.log(Level.INFO, "Rpc slobrokid changed from " + currRpc.slobrokId() + " to " + newRpc.slobrokId()); + } try { reListenRpc(newConfig); } catch (Throwable e) { |