Set SSH timeouts from configuration file It looks like during the refactoring in I253a6d94, `sshCommandTimeout` and `sshConnectionTimeout` fields were not initialized with values from the `replication.config`. This is restoring code present before change mentioned above. Change-Id: Id1f8e9f17a2a8bf7c1dfbd48b6cd005513e7b187
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationConfigImpl.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationConfigImpl.java index 76ee14b..4f2def8 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationConfigImpl.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationConfigImpl.java
@@ -13,9 +13,13 @@ // limitations under the License. package com.googlesource.gerrit.plugins.replication; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static java.util.concurrent.TimeUnit.SECONDS; + import com.google.common.base.Strings; import com.google.gerrit.common.Nullable; import com.google.gerrit.extensions.annotations.PluginData; +import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.SitePaths; import com.google.inject.Inject; import java.nio.file.Path; @@ -30,7 +34,7 @@ private int maxRefsToLog; private final int maxRefsToShow; private int sshCommandTimeout; - private int sshConnectionTimeout = DEFAULT_SSH_CONNECTION_TIMEOUT_MS; + private int sshConnectionTimeout; private final MergedConfigResource configResource; private final Path pluginDataDir; @@ -44,6 +48,17 @@ this.defaultForceUpdate = config.getBoolean("gerrit", "defaultForceUpdate", false); this.maxRefsToLog = config.getInt("gerrit", "maxRefsToLog", 0); this.maxRefsToShow = config.getInt("gerrit", "maxRefsToShow", 2); + this.sshCommandTimeout = + (int) ConfigUtil.getTimeUnit(config, "gerrit", null, "sshCommandTimeout", 0, SECONDS); + this.sshConnectionTimeout = + (int) + ConfigUtil.getTimeUnit( + config, + "gerrit", + null, + "sshConnectionTimeout", + DEFAULT_SSH_CONNECTION_TIMEOUT_MS, + MILLISECONDS); this.pluginDataDir = pluginDataDir; }