完善日志

src/Http/HttpSession.cpp

@@ -169,21 +169,32 @@ void HttpSession::onRecv(const Buffer::Ptr &pBuf) {
 }
 }
 
 
 void HttpSession::onError(const SockException& err) {
 void HttpSession::onError(const SockException& err) {
+    if(_is_flv_stream){
+        //flv播放器
+        WarnP(this) << "播放器("
+                    << _mediaInfo._vhost << "/"
+                    << _mediaInfo._app << "/"
+                    << _mediaInfo._streamid
+                    << ")断开:" << err.what();
+
+        GET_CONFIG(uint32_t,iFlowThreshold,General::kFlowThreshold);
+        if(_ui64TotalBytes > iFlowThreshold * 1024){
+            NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport,
+                                               _mediaInfo,
+                                               _ui64TotalBytes,
+                                               _ticker.createdTime()/1000,
+                                               true,
+                                               *this);
+        }
+        return;
+    }
+
+    //http客户端
     if(_ticker.createdTime() < 10 * 1000){
     if(_ticker.createdTime() < 10 * 1000){
         TraceP(this) << err.what();
         TraceP(this) << err.what();
     }else{
     }else{
         WarnP(this) << err.what();
         WarnP(this) << err.what();
     }
     }
-
-    GET_CONFIG(uint32_t,iFlowThreshold,General::kFlowThreshold);
-    if(_ui64TotalBytes > iFlowThreshold * 1024){
-        NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport,
-										   _mediaInfo,
-										   _ui64TotalBytes,
-										   _ticker.createdTime()/1000,
-										   true,
-										   *this);
-    }
 }
 }
 
 
 void HttpSession::onManager() {
 void HttpSession::onManager() {
@@ -291,6 +302,7 @@ bool HttpSession::checkLiveFlvStream(const function<void()> &cb){
 
 
             try{
             try{
                 start(getPoller(),rtmp_src);
                 start(getPoller(),rtmp_src);
+                _is_flv_stream = true;
             }catch (std::exception &ex){
             }catch (std::exception &ex){
                 //该rtmp源不存在
                 //该rtmp源不存在
                 shutdown(SockException(Err_shutdown,"rtmp mediasource released"));
                 shutdown(SockException(Err_shutdown,"rtmp mediasource released"));

src/Http/HttpSession.h

@@ -160,6 +160,7 @@ private:
     //处理content数据的callback
     //处理content数据的callback
     function<bool (const char *data,uint64_t len) > _contentCallBack;
     function<bool (const char *data,uint64_t len) > _contentCallBack;
 	bool _flv_over_websocket = false;
 	bool _flv_over_websocket = false;
+	bool _is_flv_stream = false;
 };
 };
 
 
 
 

src/Rtmp/RtmpSession.cpp

@@ -44,13 +44,17 @@ RtmpSession::~RtmpSession() {
 }
 }
 
 
 void RtmpSession::onError(const SockException& err) {
 void RtmpSession::onError(const SockException& err) {
-	WarnP(this) << err.what();
+    bool isPlayer = !_pPublisherSrc;
+    WarnP(this) << (isPlayer ? "播放器(" : "推流器(")
+                << _mediaInfo._vhost << "/"
+                << _mediaInfo._app << "/"
+                << _mediaInfo._streamid
+                << ")断开:" << err.what();
 
 
     //流量统计事件广播
     //流量统计事件广播
     GET_CONFIG(uint32_t,iFlowThreshold,General::kFlowThreshold);
     GET_CONFIG(uint32_t,iFlowThreshold,General::kFlowThreshold);
 
 
     if(_ui64TotalBytes > iFlowThreshold * 1024){
     if(_ui64TotalBytes > iFlowThreshold * 1024){
-        bool isPlayer = !_pPublisherSrc;
         NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport,
         NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport,
                                            _mediaInfo,
                                            _mediaInfo,
                                            _ui64TotalBytes,
                                            _ui64TotalBytes,

src/Rtsp/RtspSession.cpp

@@ -85,7 +85,13 @@ RtspSession::~RtspSession() {
 }
 }
 
 
 void RtspSession::onError(const SockException& err) {
 void RtspSession::onError(const SockException& err) {
-	WarnP(this) << err.what();
+    bool isPlayer = !_pushSrc;
+    WarnP(this) << (isPlayer ? "播放器(" : "推流器(")
+                << _mediaInfo._vhost << "/"
+                << _mediaInfo._app << "/"
+                << _mediaInfo._streamid
+                << ")断开:" << err.what();
+
 	if (_rtpType == Rtsp::RTP_MULTICAST) {
 	if (_rtpType == Rtsp::RTP_MULTICAST) {
 		//取消UDP端口监听
 		//取消UDP端口监听
 		UDPServer::Instance().stopListenPeer(get_peer_ip().data(), this);
 		UDPServer::Instance().stopListenPeer(get_peer_ip().data(), this);
@@ -100,7 +106,6 @@ void RtspSession::onError(const SockException& err) {
     //流量统计事件广播
     //流量统计事件广播
     GET_CONFIG(uint32_t,iFlowThreshold,General::kFlowThreshold);
     GET_CONFIG(uint32_t,iFlowThreshold,General::kFlowThreshold);
     if(_ui64TotalBytes > iFlowThreshold * 1024){
     if(_ui64TotalBytes > iFlowThreshold * 1024){
-        bool isPlayer = !_pushSrc;
         NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport,
         NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastFlowReport,
 										   _mediaInfo,
 										   _mediaInfo,
 										   _ui64TotalBytes,
 										   _ui64TotalBytes,