Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit 83eb9ae

Browse files
authored
Fix issue 1283 (#1309)
* Fix issue 1283 * Update quic testing configuration * Add default value for configuration
1 parent abdbf3c commit 83eb9ae

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

source/agent/conference/conference.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1733,10 +1733,12 @@ var Conference = function (rpcClient, selfRpcId) {
17331733
return callback('callback', 'error', 'Target video stream does NOT satisfy:' + requestError.message);
17341734
}
17351735

1736-
if (audioTrack) {
1736+
if (audioTrack && audioTrack.from) {
17371737
streamId = audioTrack.from;
1738-
} else {
1738+
} else if (videoTrack && videoTrack.from) {
17391739
streamId = videoTrack.from;
1740+
} else if (subDesc.data && subDesc.data.from) {
1741+
streamId = subDesc.data.from;
17401742
}
17411743

17421744
log.info('subscribe, streamid is:', streamId, 'streams are:', streams, 'casStreams:', casStreams);

source/agent/quic/e2e-test/config/management_api.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ ssl = true #if use HTTPS
55
port = 3000 #default: 3000, port of server
66
numberOfProcess = 4 #default: 1
77
enableWebTransport = true #default: false.
8+
servicename = "sampleService" #service name used to register to cascading cloud for accessing to communicate with this cluster
89
#enable_grpc = true
910

1011
[cluster]

source/management_api/api.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ var serverConfig = global.config.server || {};
119119
var cluster = require("cluster");
120120
var serverPort = serverConfig.port || 3000;
121121
var numCPUs = serverConfig.numberOfProcess || 1;
122+
var servicename = serverConfig.servicename || 'sampleService';
122123

123124
var ip_address;
124125
(function getPublicIP() {
@@ -220,7 +221,7 @@ if (cluster.isMaster) {
220221
if (err) {
221222
log.warn('Failed to get service:', err.message);
222223
} else {
223-
var serviceToCloud = sers.filter((t) => {return t.name === serverConfig.servicename;});
224+
var serviceToCloud = sers.filter((t) => {return t.name === servicename;});
224225
log.info('Representing service ', serviceToCloud);
225226
var key = serviceToCloud[0].key;
226227
if (serviceToCloud[0].encrypted === true) {

0 commit comments

Comments
 (0)