Replace security.authUser to gerrit.listenAs
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Keys.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Keys.java
index fa8bfaa..14de98a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Keys.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Keys.java
@@ -28,7 +28,7 @@
GERRIT_PORT("gerrit.port", "gerrit-port", 29418),
GERRIT_FRONT_URL("gerrit.canonicalWebUrl", "gerrit-front-url", ""),
GERRIT_VERSION("gerrit.version", "gerrit-version", null),
- SECURITY_AUTHUSER("security.authUser", null, null),
+ GERRIT_LISTENAS("gerrit.listenAs", null, null),
MONITOR_INTERVAL("monitor.interval", null, 15000),
MONITOR_FAILURECOUNT("monitor.failureCount", null, 15);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java
index 1efcbcd..cdde26d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java
@@ -34,8 +34,8 @@
bind(AMQPSession.class);
// bind(Properties.class);
bind(RabbitMQManager.class);
- if (!properties.hasAuthUser()) {
- // No authUser to filter events against. Register an unrestricted ChangeListener
+ if (!properties.hasListernAs()) {
+ // No listenAs to filter events against. Register an unrestricted ChangeListener
DynamicSet.bind(binder(), ChangeListener.class).to(RabbitMQManager.class);
}
DynamicSet.bind(binder(), LifecycleListener.class).to(RabbitMQManager.class);
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 eef40ce..5974c24 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java
@@ -103,13 +103,13 @@
return StringUtils.stripToEmpty(config.getString(Keys.GERRIT_FRONT_URL.section, null, Keys.GERRIT_FRONT_URL.name));
}
- public boolean hasAuthUser() {
- return !getAuthUser().isEmpty();
+ public boolean hasListernAs() {
+ return !getListenAs().isEmpty();
}
- public String getAuthUser() {
+ public String getListenAs() {
return StringUtils.stripToEmpty(pluginConfig.getString(
- Keys.SECURITY_AUTHUSER.section, null, Keys.SECURITY_AUTHUSER.name));
+ Keys.GERRIT_LISTENAS.section, null, Keys.GERRIT_LISTENAS.name));
}
public String getGerritVersion() {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/RabbitMQManager.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/RabbitMQManager.java
index 56c3c4f..da42dba 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/RabbitMQManager.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/RabbitMQManager.java
@@ -95,8 +95,8 @@
}
}, MONITOR_FIRSTTIME_DELAY, properties.getInt(Keys.MONITOR_INTERVAL));
- if (properties.hasAuthUser()) {
- final String userName = properties.getAuthUser();
+ if (properties.hasListernAs()) {
+ final String userName = properties.getListenAs();
final ChangeListener changeListener = this;
workQueue.getDefaultQueue().submit(new Runnable() {
@Override
@@ -129,15 +129,15 @@
try {
userAccount = accountResolver.find(userName);
if (userAccount == null) {
- LOGGER.error("No single user could be found when searching for authUser: "
- + userName + '\n');
+ LOGGER.error("No single user could be found when searching for listenAs: {}", userName);
return;
}
IdentifiedUser user = userFactory.create(userAccount.getId());
hooks.addChangeListener(changeListener, user);
+ LOGGER.info("Listen events as : {}", userName);
} catch (OrmException e) {
- LOGGER.error("Could not query database for authUser", e);
+ LOGGER.error("Could not query database for listenAs", e);
return;
} finally {
threadLocalRequestContext.setContext(old);
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index 067d075..4c75377 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -19,6 +19,7 @@
hostname = www.foobar.com
scheme = ssh
port = 29418
+ listenAs = gerrituser
[monitor]
interval = 15000
failureCount = 15
@@ -63,6 +64,10 @@
* The port number of gerrit for SCM connection.
This can be used for message header only.
+* `gerrit.listenAs`
+ * The user of gerrit who listen events.
+ If not specified, listen events as unrestricted user.
+
* `monitor.interval`
* The interval time in milliseconds for connection monitor.
You can specify the value more than 5000.
@@ -91,5 +96,6 @@
|gerrit.hostname | *Empty*
|gerrit.scheme | **ssh**
|gerrit.port | 29418
+|gerrit.listenAs | *Unrestricted user*
|monitor.interval | 15000
|monitor.failureCount | 15
