Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add checkpoint for deleting broadcast in Cluster #140

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add checkpoint for deleting broadcast in Cluster #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/app.page/app.page.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ <h4 class="card-title text-left" i18n="@@newLiveStreamCardTitle">

<li>
<a class="dropdown-link"
(click)="deleteLiveBroadcast(row.streamId,row.originAdress)">
(click)="deleteLiveBroadcast(row.streamId,row.originAdress, row.type, row.status)">
<ng-container i18n="@@tableDeleteButton">
Delete Broadcast</ng-container>
</a>
Expand Down Expand Up @@ -1918,4 +1918,4 @@ <h4 class="card-title text-left" i18n="@@newLiveStreamCardTitle">



</div>
</div>
5 changes: 3 additions & 2 deletions src/app/app.page/app.page.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,12 +1075,13 @@ export class AppPageComponent implements OnInit, OnDestroy, AfterViewInit {



deleteLiveBroadcast(streamId: string,broadcastHostAddress: string): void {
deleteLiveBroadcast(streamId: string, broadcastHostAddress: string, type:string, broadcastStatus: string): void {
let REMOTE_HOST_ADDRESS;
let hostAddress = localStorage.getItem('hostAddress');

// I didn't added broadcast status check. Because, some of stream sources status is finished but it's trying to connect sources.
if(this.isClusterMode && hostAddress != broadcastHostAddress) {
//But we need to add broadcast status check for live stream type.
if((this.isClusterMode && hostAddress != broadcastHostAddress) && (type != "liveStream" && broadcastStatus == "broadcasting")) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't you need to add 'livestream' as well?

REMOTE_HOST_ADDRESS = "http://" + broadcastHostAddress + ":5080";

if(this.appSettings.jwtControlEnabled != true && this.appSettings.jwtSecretKey != null){
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The message below does not make sense. It's not clear what it means.

Expand Down