Skip to content

Commit 4725ea0

Browse files
committed
signal-server driver updates
1 parent e910206 commit 4725ea0

10 files changed

Lines changed: 455 additions & 6 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,3 +264,5 @@ jdk_11_maven/cs/rest/pay-publicapi/target/
264264
jdk_11_maven/em/embedded/rest/pay-publicapi/target/
265265

266266
jdk_11_maven/em/external/rest/ind1/target/
267+
jdk_17_maven/cs/rest/signal-server/event-logger/target/
268+
jdk_17_maven/cs/rest/signal-server/websocket-resources/target/

jdk_17_maven/cs/rest/signal-server/api-doc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>TextSecureServer</artifactId>
77
<groupId>org.whispersystems.textsecure</groupId>
8-
<version>JGITVER</version>
8+
<version>10.3.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>api-doc</artifactId>

jdk_17_maven/cs/rest/signal-server/event-logger/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<artifactId>TextSecureServer</artifactId>
1212
<groupId>org.whispersystems.textsecure</groupId>
13-
<version>JGITVER</version>
13+
<version>10.3.0</version>
1414
</parent>
1515

1616
<modelVersion>4.0.0</modelVersion>

jdk_17_maven/cs/rest/signal-server/integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>TextSecureServer</artifactId>
77
<groupId>org.whispersystems.textsecure</groupId>
8-
<version>JGITVER</version>
8+
<version>10.3.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>integration-tests</artifactId>

jdk_17_maven/cs/rest/signal-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
<groupId>org.whispersystems.textsecure</groupId>
7777
<artifactId>TextSecureServer</artifactId>
78-
<version>JGITVER</version>
78+
<version>10.3.0</version>
7979

8080
<dependencyManagement>
8181
<dependencies>

jdk_17_maven/cs/rest/signal-server/service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>TextSecureServer</artifactId>
77
<groupId>org.whispersystems.textsecure</groupId>
8-
<version>JGITVER</version>
8+
<version>10.3.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>service</artifactId>

jdk_17_maven/cs/rest/signal-server/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,25 @@
236236
import software.amazon.awssdk.services.s3.S3AsyncClient;
237237
import software.amazon.awssdk.services.s3.S3Client;
238238

239+
import org.eclipse.jetty.server.AbstractNetworkConnector;
240+
import org.eclipse.jetty.server.Server;
241+
239242
public class WhisperServerService extends Application<WhisperServerConfiguration> {
240243

241244
private static final Logger log = LoggerFactory.getLogger(WhisperServerService.class);
242245

243246
public static final String SECRETS_BUNDLE_FILE_NAME_PROPERTY = "secrets.bundle.filename";
244247

248+
private Server jettyServer;
249+
250+
public int getJettyPort() {
251+
return ((AbstractNetworkConnector)jettyServer.getConnectors()[0]).getLocalPort();
252+
}
253+
254+
public Server getJettyServer() {
255+
return jettyServer;
256+
}
257+
245258
public static final software.amazon.awssdk.auth.credentials.AwsCredentialsProvider AWSSDK_CREDENTIALS_PROVIDER =
246259
AwsCredentialsProviderChain.of(
247260
InstanceProfileCredentialsProvider.create(),
@@ -840,6 +853,9 @@ public void run(WhisperServerConfiguration config, Environment environment) thro
840853
environment.healthChecks().register("cacheCluster", new RedisClusterHealthCheck(cacheCluster));
841854

842855
MetricsUtil.registerSystemResourceMetrics(environment);
856+
857+
// Note: Custom code
858+
environment.lifecycle().addServerLifecycleListener(server -> jettyServer = server);
843859
}
844860

845861

jdk_17_maven/cs/rest/signal-server/websocket-resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>TextSecureServer</artifactId>
77
<groupId>org.whispersystems.textsecure</groupId>
8-
<version>JGITVER</version>
8+
<version>10.3.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>websocket-resources</artifactId>

jdk_17_maven/em/embedded/rest/signal-server/src/main/java/em/embedded/textsecuregcm/EmbeddedEvoMasterController.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
77
import org.evomaster.client.java.controller.problem.ProblemInfo;
88
import org.evomaster.client.java.sql.DbSpecification;
9+
import org.whispersystems.textsecuregcm.WhisperServerService;
910

1011
import java.util.List;
1112

@@ -61,7 +62,33 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
6162

6263
@Override
6364
public String startSut() {
65+
application = new WhisperServerService();
66+
67+
68+
// try {
69+
// application.run("server", "src/main/resources/em-sample.yml");
70+
// } catch (Exception e) {
71+
// e.printStackTrace();
72+
// return null;
73+
// }
74+
75+
try {
76+
Thread.sleep(3_000);
77+
} catch (InterruptedException e) {
78+
79+
}
80+
81+
// while(!application.getJettyServer().isStarted()) {
82+
// try {
83+
// Thread.sleep(3_000);
84+
// } catch (InterruptedException e) {
85+
//
86+
// }
87+
// }
88+
89+
// return "http://localhost:" + application.getJettyPort();
6490
return null;
91+
6592
}
6693

6794
@Override

0 commit comments

Comments
 (0)