mirror of
https://github.com/signalapp/Signal-Server
synced 2026-04-22 13:38:01 +01:00
Allow configuration of multiple directory account crawler listeners (#325)
* Allow configuration of multiple directory account crawler listeners Only one should update the local redis directory. This one is marked with replicationPrimary true. The others in the list only serve to issue replication requests over to CDS replication load balancers. * Update one more metric name
This commit is contained in:
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
|
||||
public class DirectoryConfiguration {
|
||||
|
||||
@@ -29,7 +30,7 @@ public class DirectoryConfiguration {
|
||||
@JsonProperty
|
||||
@NotNull
|
||||
@Valid
|
||||
private DirectoryServerConfiguration server;
|
||||
private List<DirectoryServerConfiguration> server;
|
||||
|
||||
public RedisConfiguration getRedisConfiguration() {
|
||||
return redis;
|
||||
@@ -43,8 +44,7 @@ public class DirectoryConfiguration {
|
||||
return client;
|
||||
}
|
||||
|
||||
public DirectoryServerConfiguration getDirectoryServerConfiguration() {
|
||||
public List<DirectoryServerConfiguration> getDirectoryServerConfiguration() {
|
||||
return server;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -9,6 +9,13 @@ import org.hibernate.validator.constraints.NotEmpty;
|
||||
|
||||
public class DirectoryServerConfiguration {
|
||||
|
||||
@NotEmpty
|
||||
@JsonProperty
|
||||
private String replicationName;
|
||||
|
||||
@JsonProperty
|
||||
private boolean replicationPrimary;
|
||||
|
||||
@NotEmpty
|
||||
@JsonProperty
|
||||
private String replicationUrl;
|
||||
@@ -21,6 +28,14 @@ public class DirectoryServerConfiguration {
|
||||
@JsonProperty
|
||||
private String replicationCaCertificate;
|
||||
|
||||
public String getReplicationName() {
|
||||
return replicationName;
|
||||
}
|
||||
|
||||
public boolean isReplicationPrimary() {
|
||||
return replicationPrimary;
|
||||
}
|
||||
|
||||
public String getReplicationUrl() {
|
||||
return replicationUrl;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user