diff --git a/trunk/src/app/srs_app_ingest.cpp b/trunk/src/app/srs_app_ingest.cpp index 3d43ddff8..b3c61622a 100644 --- a/trunk/src/app/srs_app_ingest.cpp +++ b/trunk/src/app/srs_app_ingest.cpp @@ -345,12 +345,11 @@ void SrsIngester::ingester() } // reportable - if (!pithy_print->can_print()) { - return; + if (pithy_print->can_print()) { + // TODO: FIXME: show more info. + srs_trace("-> "SRS_LOG_ID_INGESTER + " time=%"PRId64", ingesters=%d", pithy_print->age(), (int)ingesters.size()); } - - // TODO: FIXME: show more info. - srs_trace("-> time=%"PRId64", ingesters=%d", pithy_print->age(), (int)ingesters.size()); } int SrsIngester::on_reload_vhost_added(string vhost) diff --git a/trunk/src/kernel/srs_kernel_log.hpp b/trunk/src/kernel/srs_kernel_log.hpp index 9cd495d4f..9c1993784 100644 --- a/trunk/src/kernel/srs_kernel_log.hpp +++ b/trunk/src/kernel/srs_kernel_log.hpp @@ -156,5 +156,7 @@ extern ISrsThreadContext* _srs_context; #define SRS_LOG_ID_CLIENT_PUBLISH "CPB" // web/flash publish to edge/origin #define SRS_LOG_ID_WEB_PUBLISH "WPB" +// ingester for edge(play)/origin +#define SRS_LOG_ID_INGESTER "IGS" #endif diff --git a/trunk/src/rtmp/srs_protocol_io.hpp b/trunk/src/rtmp/srs_protocol_io.hpp index 2e9fe1464..85d265e07 100644 --- a/trunk/src/rtmp/srs_protocol_io.hpp +++ b/trunk/src/rtmp/srs_protocol_io.hpp @@ -47,6 +47,7 @@ public: virtual void set_recv_timeout(int64_t timeout_us) = 0; virtual int64_t get_recv_timeout() = 0; virtual int64_t get_recv_bytes() = 0; + // TODO: FIXME: remove this interface. virtual int get_recv_kbps() = 0; }; @@ -63,6 +64,7 @@ public: virtual void set_send_timeout(int64_t timeout_us) = 0; virtual int64_t get_send_timeout() = 0; virtual int64_t get_send_bytes() = 0; + // TODO: FIXME: remove this interface. virtual int get_send_kbps() = 0; virtual int writev(const iovec *iov, int iov_size, ssize_t* nwrite) = 0; };