commit f2fb718f9d30f2e84a4be074e598c221313afc61
author rinrinne <rinrin.ne@gmail.com> Fri Feb 20 19:08:29 2015 +0900
committer rinrinne <rinrin.ne@gmail.com> Fri Feb 27 19:36:21 2015 +0900
tree 1239f14f47c4a85a312ecc8f2d076c28534b993c
parent b163f1d7b839255f1e336633c4ab7a7572cedb3b

Get plugin name then assume config filename

src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java
index 6d047fc..f03c347 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java
@@ -15,6 +15,7 @@
 package com.googlesource.gerrit.plugins.rabbitmq;
 
 import com.google.gerrit.common.Version;
+import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.config.SitePaths;
 import com.google.inject.Inject;
@@ -43,7 +44,7 @@
   public final static String CONTENT_TYPE_JSON = "application/json";
 
   private static final Logger LOGGER = LoggerFactory.getLogger(Properties.class);
-  private final static String CONFIG_FILENAME = "rabbitmq.config";
+  private final static String CONFIG_FILEEXT = ".config";
 
   private final static int MINIMUM_CONNECTION_MONITOR_INTERVAL = 5000;
 
@@ -52,9 +53,9 @@
   private AMQP.BasicProperties properties;
 
   @Inject
-  public Properties(final SitePaths site, @GerritServerConfig final Config config) {
+  public Properties(@PluginName final String pluginName, final SitePaths site, @GerritServerConfig final Config config) {
     this.config = config;
-    this.pluginConfig = getPluginConfig(new File(site.etc_dir, CONFIG_FILENAME));
+    this.pluginConfig = getPluginConfig(new File(site.etc_dir, pluginName + CONFIG_FILEEXT));
     this.properties = generateBasicProperties();
   }