Skip to content

Commit

Permalink
early webhook fix along with test fixes according to changes
Browse files Browse the repository at this point in the history
  • Loading branch information
eneskuluk committed Apr 3, 2021
1 parent 84344a0 commit a5c4453
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
12 changes: 0 additions & 12 deletions src/main/java/io/antmedia/AntMediaApplicationAdapter.java
Original file line number Diff line number Diff line change
Expand Up @@ -434,18 +434,6 @@ public void streamSubscriberClose(ISubscriberStream stream) {
vertx.setTimer(1, l -> getDataStore().updateRtmpViewerCount(stream.getBroadcastStreamPublishName(), false));
}

public void streamPublishStart(final IBroadcastStream stream) {
String streamName = stream.getPublishedName();
logger.info("stream name in streamPublishStart: {}", streamName );
long absoluteStartTimeMs = 0;
if (stream instanceof ClientBroadcastStream) {
absoluteStartTimeMs = ((ClientBroadcastStream) stream).getAbsoluteStartTimeMs();
}
startPublish(streamName, absoluteStartTimeMs);


}

public void startPublish(String streamName, long absoluteStartTimeMs) {
vertx.executeBlocking( handler -> {
try {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/antmedia/test/Application.java
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,5 @@ public boolean isServerShuttingDown() {
return false;
}


public void startPublish(String streamName, long absoluteStartTimeMs){getAppAdaptor().startPublish(streamName, absoluteStartTimeMs);}
}
4 changes: 2 additions & 2 deletions src/test/java/io/antmedia/test/MuxerUnitTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ public void testAbsoluteStartTimeMs()
Mockito.when(stream.getPublishedName()).thenReturn(streamId);

doReturn(stream).when(spyAdaptor).getBroadcastStream(Mockito.any(), Mockito.any());
spyAdaptor.streamPublishStart(stream);
spyAdaptor.startPublish(streamId,0);


long absoluteTimeMS = System.currentTimeMillis();
Expand Down Expand Up @@ -1004,7 +1004,7 @@ public void testPublishAndUnpublishSocialEndpoints() {

appAdaptor.getDataStore().addEndpoint(broadcast.getStreamId(), endpoint);

appAdaptor.streamPublishStart(stream);
appAdaptor.startPublish(stream.getPublishedName(),broadcast.getAbsoluteStartTimeMs());

Awaitility.await().atMost(5, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS)
.until(() ->
Expand Down

0 comments on commit a5c4453

Please sign in to comment.