Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-25 15:28:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use push microservice instead of doing push directly.

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2014-12-01 11:23:29 -08:00
parent 675b6f4b5e
commit 3452ea29b8
11 changed files with 241 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
View File

@@ -24,6 +24,7 @@ import org.whispersystems.textsecuregcm.configuration.GraphiteConfiguration;
import org.whispersystems.textsecuregcm.configuration.MemcacheConfiguration;
import org.whispersystems.textsecuregcm.configuration.MetricsConfiguration;
import org.whispersystems.textsecuregcm.configuration.NexmoConfiguration;
import org.whispersystems.textsecuregcm.configuration.PushConfiguration;
import org.whispersystems.textsecuregcm.configuration.RateLimitsConfiguration;
import org.whispersystems.textsecuregcm.configuration.RedPhoneConfiguration;
import org.whispersystems.textsecuregcm.configuration.RedisConfiguration;
@@ -35,6 +36,7 @@ import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import io.dropwizard.Configuration;
import io.dropwizard.client.JerseyClientConfiguration;
import io.dropwizard.db.DataSourceFactory;
public class WhisperServerConfiguration extends Configuration {
@@ -50,7 +52,7 @@ public class WhisperServerConfiguration extends Configuration {
@NotNull
@Valid
@JsonProperty
private GcmConfiguration gcm;
private PushConfiguration push;
@NotNull
@Valid
@@ -67,9 +69,6 @@ public class WhisperServerConfiguration extends Configuration {
@JsonProperty
private RedisConfiguration redis;
@JsonProperty
private ApnConfiguration apn = new ApnConfiguration();
@Valid
@JsonProperty
private FederationConfiguration federation = new FederationConfiguration();
@@ -99,6 +98,12 @@ public class WhisperServerConfiguration extends Configuration {
@JsonProperty
private RedPhoneConfiguration redphone = new RedPhoneConfiguration();
@Valid
@NotNull
@JsonProperty
private JerseyClientConfiguration httpClient = new JerseyClientConfiguration();
public WebsocketConfiguration getWebsocketConfiguration() {
return websocket;
}
@@ -111,12 +116,12 @@ public class WhisperServerConfiguration extends Configuration {
return nexmo;
}
public GcmConfiguration getGcmConfiguration() {
return gcm;
public PushConfiguration getPushConfiguration() {
return push;
}
public ApnConfiguration getApnConfiguration() {
return apn;
public JerseyClientConfiguration getJerseyClientConfiguration() {
return httpClient;
}
public S3Configuration getS3Configuration() {