commit 1341a7168c42221114fbc7cde2954f8516eda9c9
author Nasser Grainawi <nasser@codeaurora.org> Mon Mar 02 16:32:17 2020 -0700
committer Luca Milanesio <luca.milanesio@gmail.com> Mon Mar 23 23:04:08 2020 +0000
tree 31112f619e273cb4dd8018c78073cdcffca0cb19
parent 9d1d158c0f4b48581183b878aebc4bfb61450af3

Extract destinations logic into a new class

The config file is never loaded by ReplicationFileBasedConfig and thus
is empty in its constructor. config.load() is later called by
DestinationsCollection.validateConfig(), but that doesn't affect the
values stored in ReplicationFileBasedConfig.

It seems DestinationsCollection.validateConfig() shouldn't be reading
config values or calling load() directly, but I'll address that in a
follow-up change.

Change-Id: I3f53237a1f0ac03948b72ae388722aed65716b4b

src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFileBasedConfig.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFileBasedConfig.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFileBasedConfig.java
index 554e441..b963ab8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFileBasedConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFileBasedConfig.java
@@ -13,12 +13,16 @@
 // limitations under the License.
 package com.googlesource.gerrit.plugins.replication;
 
+import static com.googlesource.gerrit.plugins.replication.ReplicationQueue.repLog;
+
 import com.google.common.base.Strings;
 import com.google.gerrit.extensions.annotations.PluginData;
 import com.google.gerrit.server.config.SitePaths;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import java.io.IOException;
 import java.nio.file.Path;
+import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
 import org.eclipse.jgit.util.FS;
 
@@ -41,6 +45,13 @@
     this.site = site;
     this.cfgPath = site.etc_dir.resolve("replication.config");
     this.config = new FileBasedConfig(cfgPath.toFile(), FS.DETECTED);
+    try {
+      config.load();
+    } catch (ConfigInvalidException e) {
+      repLog.error(String.format("Config file %s is invalid: %s", cfgPath, e.getMessage()), e);
+    } catch (IOException e) {
+      repLog.error(String.format("Cannot read %s: %s", cfgPath, e.getMessage()), e);
+    }
     this.replicateAllOnPluginStart = config.getBoolean("gerrit", "replicateOnStartup", false);
     this.defaultForceUpdate = config.getBoolean("gerrit", "defaultForceUpdate", false);
     this.maxRefsToLog = config.getInt("gerrit", "maxRefsToLog", 0);