external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For #1520, add TODO list for configing server itself in coworker.

Browse source
This commit is contained in:
winlin 2019-12-19 14:15:21 +08:00
parent acfeb8a66f
commit d7078a72d4
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/conf/origin.cluster.serverA.conf
View file

@ -15,6 +15,6 @@ vhost __defaultVhost__ {
cluster { cluster {
mode local; mode local;
origin_cluster on; origin_cluster on;
coworkers 127.0.0.1:9091 127.0.0.1:9092; coworkers 127.0.0.1:9090 127.0.0.1:9091 127.0.0.1:9092;
} }
} }

2
trunk/conf/origin.cluster.serverB.conf
View file

@ -15,6 +15,6 @@ vhost __defaultVhost__ {
cluster { cluster {
mode local; mode local;
origin_cluster on; origin_cluster on;
coworkers 127.0.0.1:9090 127.0.0.1:9092; coworkers 127.0.0.1:9090 127.0.0.1:9091 127.0.0.1:9092;
} }
} }

2
trunk/conf/origin.cluster.serverC.conf
View file

@ -15,6 +15,6 @@ vhost __defaultVhost__ {
cluster { cluster {
mode local; mode local;
origin_cluster on; origin_cluster on;
coworkers 127.0.0.1:9090 127.0.0.1:9091; coworkers 127.0.0.1:9090 127.0.0.1:9091 127.0.0.1:9092;
} }
} }

14
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -607,11 +607,12 @@ srs_error_t SrsRtmpConn::playing(SrsSource* source)
if (!info->edge && _srs_config->get_vhost_origin_cluster(req->vhost) && source->inactive()) { if (!info->edge && _srs_config->get_vhost_origin_cluster(req->vhost) && source->inactive()) {
vector<string> coworkers = _srs_config->get_vhost_coworkers(req->vhost); vector<string> coworkers = _srs_config->get_vhost_coworkers(req->vhost);
for (int i = 0; i < (int)coworkers.size(); i++) { for (int i = 0; i < (int)coworkers.size(); i++) {
int port; // TODO: FIXME: User may config the server itself as coworker, we must identify and ignore it.
string host; string host; int port = 0; string coworker = coworkers.at(i);
string url = "http://" + coworkers.at(i) + "/api/v1/clusters?"
string url = "http://" + coworker + "/api/v1/clusters?"
+ "vhost=" + req->vhost + "&ip=" + req->host + "&app=" + req->app + "&stream=" + req->stream + "vhost=" + req->vhost + "&ip=" + req->host + "&app=" + req->app + "&stream=" + req->stream
+ "&coworker=" + coworkers.at(i); + "&coworker=" + coworker;
if ((err = SrsHttpHooks::discover_co_workers(url, host, port)) != srs_success) { if ((err = SrsHttpHooks::discover_co_workers(url, host, port)) != srs_success) {
// If failed to discovery stream in this coworker, we should request the next one util the last. // If failed to discovery stream in this coworker, we should request the next one util the last.
// @see https://github.com/ossrs/srs/issues/1223 // @see https://github.com/ossrs/srs/issues/1223
@ -623,6 +624,11 @@ srs_error_t SrsRtmpConn::playing(SrsSource* source)
srs_trace("rtmp: redirect in cluster, from=%s:%d, target=%s:%d, url=%s", srs_trace("rtmp: redirect in cluster, from=%s:%d, target=%s:%d, url=%s",
req->host.c_str(), req->port, host.c_str(), port, url.c_str()); req->host.c_str(), req->port, host.c_str(), port, url.c_str());
// Ignore if host or port is invalid.
if (host.empty() || port == 0) {
continue;
}
bool accepted = false; bool accepted = false;
if ((err = rtmp->redirect(req, host, port, accepted)) != srs_success) { if ((err = rtmp->redirect(req, host, port, accepted)) != srs_success) {
srs_error_reset(err); srs_error_reset(err);