external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity

Refactor source cid with pid

Browse source
This commit is contained in:
winlin 2020-03-17 18:43:11 +08:00
parent 28c1c57854
commit fc84f1e545
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
trunk/src/app/srs_app_http_stream.cpp
View file

@ -29,6 +29,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include <sstream> #include <sstream>
using namespace std; using namespace std;
@ -1132,8 +1133,8 @@ srs_error_t SrsHttpStreamServer::hijack(ISrsHttpMessage* request, ISrsHttpHandle
// trigger edge to fetch from origin. // trigger edge to fetch from origin.
bool vhost_is_edge = _srs_config->get_vhost_is_edge(r->vhost); bool vhost_is_edge = _srs_config->get_vhost_is_edge(r->vhost);
srs_trace("flv: source url=%s, is_edge=%d, source_id=%d[%d]", srs_trace("flv: source url=%s, is_edge=%d, source_id=[%d][%d]",
r->get_stream_url().c_str(), vhost_is_edge, s->source_id(), s->source_id()); r->get_stream_url().c_str(), vhost_is_edge, ::getpid(), s->source_id());
return err; return err;
} }

4
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -662,8 +662,8 @@ srs_error_t SrsRtcSenderThread::cycle()
return srs_error_wrap(err, "rtc fetch source failed"); return srs_error_wrap(err, "rtc fetch source failed");
} }
srs_trace("source url=%s, source_id=%d[%d]", srs_trace("source url=%s, source_id=[%d][%d]",
rtc_session->request.get_stream_url().c_str(), source->source_id(), source->source_id()); rtc_session->request.get_stream_url().c_str(), ::getpid(), source->source_id());
SrsConsumer* consumer = NULL; SrsConsumer* consumer = NULL;
if ((err = source->create_consumer(NULL, consumer)) != srs_success) { if ((err = source->create_consumer(NULL, consumer)) != srs_success) {

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

@ -507,8 +507,8 @@ srs_error_t SrsRtmpConn::stream_service_cycle()
} }
bool enabled_cache = _srs_config->get_gop_cache(req->vhost); bool enabled_cache = _srs_config->get_gop_cache(req->vhost);
srs_trace("source url=%s, ip=%s, cache=%d, is_edge=%d, source_id=%d[%d]", srs_trace("source url=%s, ip=%s, cache=%d, is_edge=%d, source_id=[%d][%d]",
req->get_stream_url().c_str(), ip.c_str(), enabled_cache, info->edge, source->source_id(), source->source_id()); req->get_stream_url().c_str(), ip.c_str(), enabled_cache, info->edge, ::getpid(), source->source_id());
source->set_cache(enabled_cache); source->set_cache(enabled_cache);
switch (info->type) { switch (info->type) {