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

Make WebSocket optional, disabled by default. Add tests.

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-02-12 14:39:45 -08:00
parent a9994ef5aa
commit a6463df5bb
13 changed files with 250 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ import org.whispersystems.textsecuregcm.configuration.RateLimitsConfiguration;
import org.whispersystems.textsecuregcm.configuration.RedisConfiguration;
import org.whispersystems.textsecuregcm.configuration.S3Configuration;
import org.whispersystems.textsecuregcm.configuration.TwilioConfiguration;
import org.whispersystems.textsecuregcm.configuration.WebsocketConfiguration;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
@@ -83,6 +84,14 @@ public class WhisperServerConfiguration extends Configuration {
@JsonProperty
private GraphiteConfiguration graphite = new GraphiteConfiguration();
@Valid
@JsonProperty
private WebsocketConfiguration websocket = new WebsocketConfiguration();
public WebsocketConfiguration getWebsocketConfiguration() {
return websocket;
}
public TwilioConfiguration getTwilioConfiguration() {
return twilio;
}