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

refine log, to 0.9.123

Browse source
This commit is contained in:
winlin 2014-05-29 14:16:34 +08:00
parent 7ec202ee41
commit 5273509554
13 changed files with 157 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

20
trunk/src/app/srs_app_edge.cpp
View file

@ -152,8 +152,10 @@ int SrsEdgeIngester::cycle()
return ret;
}
if ((ret = ingest()) != ERROR_SUCCESS) {
return ret;
ret = ingest();
if (srs_is_client_gracefully_close(ret)) {
srs_warn("origin disconnected, retry. ret=%d", ret);
ret = ERROR_SUCCESS;
}
return ret;
@ -186,7 +188,9 @@ int SrsEdgeIngester::ingest()
// read from client.
SrsMessage* msg = NULL;
if ((ret = client->recv_message(&msg)) != ERROR_SUCCESS) {
srs_error("ingest recv origin server message failed. ret=%d", ret);
if (!srs_is_client_gracefully_close(ret)) {
srs_error("ingest recv origin server message failed. ret=%d", ret);
}
return ret;
}
srs_verbose("edge loop recv message. ret=%d", ret);
@ -286,11 +290,8 @@ int SrsEdgeIngester::connect_server()
server = server.substr(0, pos);
port = ::atoi(s_port.c_str());
}
// open socket.
srs_trace("edge connected, can_publish=%d, url=%s/%s, server=%s:%d",
_source->can_publish(), _req->tcUrl.c_str(), _req->stream.c_str(), server.c_str(), port);
// open socket.
// TODO: FIXME: extract utility method
int sock = socket(AF_INET, SOCK_STREAM, 0);
if(sock == -1){
@ -332,7 +333,10 @@ int SrsEdgeIngester::connect_server()
srs_error("connect to server error. ip=%s, port=%d, ret=%d", ip.c_str(), port, ret);
return ret;
}
srs_trace("connect to server success. server=%s, ip=%s, port=%d", server.c_str(), ip.c_str(), port);
srs_info("connect to server success. server=%s, ip=%s, port=%d", server.c_str(), ip.c_str(), port);
srs_trace("edge connected, can_publish=%d, url=%s/%s, server=%s:%d",
_source->can_publish(), _req->tcUrl.c_str(), _req->stream.c_str(), server.c_str(), port);
return ret;
}

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

@ -99,7 +99,7 @@ int SrsRtmpConn::do_cycle()
{
int ret = ERROR_SUCCESS;
srs_trace("serve client, peer ip=%s", ip.c_str());
srs_trace("serve client ip=%s", ip.c_str());
rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US);
rtmp->set_send_timeout(SRS_SEND_TIMEOUT_US);
@ -140,7 +140,7 @@ int SrsRtmpConn::do_cycle()
}
srs_verbose("check vhost success.");
srs_trace("rtmp connect app success. "
srs_trace("connect app, "
"tcUrl=%s, pageUrl=%s, swfUrl=%s, schema=%s, vhost=%s, port=%s, app=%s",
req->tcUrl.c_str(), req->pageUrl.c_str(), req->swfUrl.c_str(),
req->schema.c_str(), req->vhost.c_str(), req->port.c_str(),
@ -254,11 +254,13 @@ int SrsRtmpConn::stream_service_cycle()
SrsRtmpConnType type;
if ((ret = rtmp->identify_client(res->stream_id, type, req->stream, req->duration)) != ERROR_SUCCESS) {
srs_error("identify client failed. ret=%d", ret);
if (!srs_is_client_gracefully_close(ret)) {
srs_error("identify client failed. ret=%d", ret);
}
return ret;
}
req->strip();
srs_trace("identify client success. type=%s, stream_name=%s, duration=%.2f",
srs_trace("client identified, type=%s, stream_name=%s, duration=%.2f",
srs_client_type_string(type).c_str(), req->stream.c_str(), req->duration);
// client is identified, set the timeout to service timeout.

29
trunk/src/app/srs_app_source.cpp
View file

@ -23,6 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_source.hpp>
#include <sstream>
#include <algorithm>
using namespace std;
@ -850,11 +851,28 @@ int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata)
return ret;
}
#endif
SrsAmf0Any* prop = NULL;
// generate metadata info to print
std::stringstream ss;
if ((prop = metadata->metadata->ensure_property_number("width")) != NULL) {
ss << ", width=" << (int)prop->to_number();
}
if ((prop = metadata->metadata->ensure_property_number("height")) != NULL) {
ss << ", height=" << (int)prop->to_number();
}
if ((prop = metadata->metadata->ensure_property_number("videocodecid")) != NULL) {
ss << ", vcodec=" << (int)prop->to_number();
}
if ((prop = metadata->metadata->ensure_property_number("audiocodecid")) != NULL) {
ss << ", acodec=" << (int)prop->to_number();
}
// add server info to metadata
metadata->metadata->set("server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")"));
metadata->metadata->set("authors", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY_AUTHROS));
SrsAmf0Any* prop = NULL;
if ((prop = metadata->metadata->get_property("audiosamplerate")) != NULL) {
if (prop->is_number()) {
sample_rate = (int)prop->to_number();
@ -912,7 +930,7 @@ int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata)
return ret;
}
}
srs_trace("dispatch metadata success.");
srs_trace("got metadata%s", ss.str().c_str());
}
// copy to all forwarders
@ -996,7 +1014,7 @@ int SrsSource::on_audio(SrsMessage* audio)
if (SrsCodec::audio_is_sequence_header(msg->payload, msg->size)) {
srs_freep(cache_sh_audio);
cache_sh_audio = msg->copy();
srs_trace("update audio sequence header success. size=%d", msg->header.payload_length);
srs_trace("got audio sh, size=%d", msg->header.payload_length);
return ret;
}
@ -1086,7 +1104,7 @@ int SrsSource::on_video(SrsMessage* video)
if (SrsCodec::video_is_sequence_header(msg->payload, msg->size)) {
srs_freep(cache_sh_video);
cache_sh_video = msg->copy();
srs_trace("update video sequence header success. size=%d", msg->header.payload_length);
srs_trace("got video sh, size=%d", msg->header.payload_length);
return ret;
}
@ -1277,7 +1295,8 @@ void SrsSource::on_unpublish()
srs_freep(cache_sh_video);
srs_freep(cache_sh_audio);
srs_trace("clear cache/metadata/sequence-headers when unpublish.");
srs_info("clear cache/metadata/sequence-headers when unpublish.");
srs_trace("cleanup when unpublish");
_can_publish = true;
_source_id = -1;