Merge branch '2.2.x'

This commit is contained in:
spencergibb
2020-08-14 10:58:20 -04:00

View File

@@ -83,12 +83,16 @@ public class ZookeeperAutoConfiguration {
});
curator.start();
log.trace("blocking until connected to zookeeper for "
+ properties.getBlockUntilConnectedWait()
+ properties.getBlockUntilConnectedUnit());
if (log.isTraceEnabled()) {
log.trace("blocking until connected to zookeeper for "
+ properties.getBlockUntilConnectedWait()
+ properties.getBlockUntilConnectedUnit());
}
curator.blockUntilConnected(properties.getBlockUntilConnectedWait(),
properties.getBlockUntilConnectedUnit());
log.trace("connected to zookeeper");
if (log.isTraceEnabled()) {
log.trace("connected to zookeeper");
}
return curator;
}