| Index: webrtc/logging/rtc_event_log/rtc_event_log.cc
|
| diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.cc b/webrtc/logging/rtc_event_log/rtc_event_log.cc
|
| index 902ce423436b15633b4146589360a489d2634a7e..800b39370dbd02e379b0b71f66e6ffa865c618ce 100644
|
| --- a/webrtc/logging/rtc_event_log/rtc_event_log.cc
|
| +++ b/webrtc/logging/rtc_event_log/rtc_event_log.cc
|
| @@ -34,7 +34,6 @@
|
| #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h"
|
| #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
|
| #include "webrtc/system_wrappers/include/file_wrapper.h"
|
| -#include "webrtc/system_wrappers/include/logging.h"
|
|
|
| #ifdef ENABLE_RTC_EVENT_LOG
|
| // Files generated at build-time by the protobuf compiler.
|
| @@ -207,15 +206,12 @@ bool RtcEventLogImpl::StartLogging(const std::string& file_name,
|
| message.stop_time = std::numeric_limits<int64_t>::max();
|
| message.file.reset(FileWrapper::Create());
|
| if (!message.file->OpenFile(file_name.c_str(), false)) {
|
| - LOG(LS_ERROR) << "Can't open file. WebRTC event log not started.";
|
| return false;
|
| }
|
| if (!message_queue_.Insert(&message)) {
|
| - LOG(LS_ERROR) << "Message queue full. Can't start logging.";
|
| return false;
|
| }
|
| helper_thread_.SignalNewEvent();
|
| - LOG(LS_INFO) << "Starting WebRTC event log.";
|
| return true;
|
| }
|
|
|
| @@ -232,24 +228,19 @@ bool RtcEventLogImpl::StartLogging(rtc::PlatformFile platform_file,
|
| message.file.reset(FileWrapper::Create());
|
| FILE* file_handle = rtc::FdopenPlatformFileForWriting(platform_file);
|
| if (!file_handle) {
|
| - LOG(LS_ERROR) << "Can't open file. WebRTC event log not started.";
|
| // Even though we failed to open a FILE*, the platform_file is still open
|
| // and needs to be closed.
|
| if (!rtc::ClosePlatformFile(platform_file)) {
|
| - LOG(LS_ERROR) << "Can't close file.";
|
| }
|
| return false;
|
| }
|
| if (!message.file->OpenFromFileHandle(file_handle)) {
|
| - LOG(LS_ERROR) << "Can't open file. WebRTC event log not started.";
|
| return false;
|
| }
|
| if (!message_queue_.Insert(&message)) {
|
| - LOG(LS_ERROR) << "Message queue full. Can't start logging.";
|
| return false;
|
| }
|
| helper_thread_.SignalNewEvent();
|
| - LOG(LS_INFO) << "Starting WebRTC event log.";
|
| return true;
|
| }
|
|
|
| @@ -266,10 +257,8 @@ void RtcEventLogImpl::StopLogging() {
|
| // clear any STOP_FILE messages. To ensure that there is only one call at a
|
| // time, we require that all calls to StopLogging are made on the same
|
| // thread.
|
| - LOG(LS_ERROR) << "Message queue full. Clearing queue to stop logging.";
|
| message_queue_.Clear();
|
| }
|
| - LOG(LS_INFO) << "Stopping WebRTC event log.";
|
| helper_thread_.WaitForFileFinished();
|
| }
|
|
|
| @@ -570,7 +559,6 @@ void RtcEventLogImpl::LogProbeResult(int id,
|
|
|
| void RtcEventLogImpl::StoreEvent(std::unique_ptr<rtclog::Event>* event) {
|
| if (!event_queue_.Insert(event)) {
|
| - LOG(LS_ERROR) << "WebRTC event log queue full. Dropping event.";
|
| }
|
| helper_thread_.SignalNewEvent();
|
| }
|
| @@ -597,7 +585,6 @@ bool RtcEventLogNullImpl::StartLogging(rtc::PlatformFile platform_file,
|
| int64_t max_size_bytes) {
|
| // The platform_file is open and needs to be closed.
|
| if (!rtc::ClosePlatformFile(platform_file)) {
|
| - LOG(LS_ERROR) << "Can't close file.";
|
| }
|
| return false;
|
| }
|
|
|