Stop using LOG macros in favor of RTC_ prefixed macros.
This CL has been generated with the following script:
for m in PLOG \
LOG_TAG \
LOG_GLEM \
LOG_GLE_EX \
LOG_GLE \
LAST_SYSTEM_ERROR \
LOG_ERRNO_EX \
LOG_ERRNO \
LOG_ERR_EX \
LOG_ERR \
LOG_V \
LOG_F \
LOG_T_F \
LOG_E \
LOG_T \
LOG_CHECK_LEVEL_V \
LOG_CHECK_LEVEL \
LOG
do
git grep -l $m | xargs sed -i "s,\b$m\b,RTC_$m,g"
done
git checkout rtc_base/logging.h
git cl format
Bug: webrtc:8452
Change-Id: I1a53ef3e0a5ef6e244e62b2e012b864914784600
Reviewed-on: https://webrtc-review.googlesource.com/21325
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20617}diff --git a/examples/peerconnection/client/conductor.cc b/examples/peerconnection/client/conductor.cc
index 3e3bfda..7394137 100644
--- a/examples/peerconnection/client/conductor.cc
+++ b/examples/peerconnection/client/conductor.cc
@@ -43,11 +43,9 @@
return
new rtc::RefCountedObject<DummySetSessionDescriptionObserver>();
}
- virtual void OnSuccess() {
- LOG(INFO) << __FUNCTION__;
- }
+ virtual void OnSuccess() { RTC_LOG(INFO) << __FUNCTION__; }
virtual void OnFailure(const std::string& error) {
- LOG(INFO) << __FUNCTION__ << " " << error;
+ RTC_LOG(INFO) << __FUNCTION__ << " " << error;
}
protected:
@@ -162,22 +160,22 @@
// Called when a remote stream is added
void Conductor::OnAddStream(
rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) {
- LOG(INFO) << __FUNCTION__ << " " << stream->label();
+ RTC_LOG(INFO) << __FUNCTION__ << " " << stream->label();
main_wnd_->QueueUIThreadCallback(NEW_STREAM_ADDED, stream.release());
}
void Conductor::OnRemoveStream(
rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) {
- LOG(INFO) << __FUNCTION__ << " " << stream->label();
+ RTC_LOG(INFO) << __FUNCTION__ << " " << stream->label();
main_wnd_->QueueUIThreadCallback(STREAM_REMOVED, stream.release());
}
void Conductor::OnIceCandidate(const webrtc::IceCandidateInterface* candidate) {
- LOG(INFO) << __FUNCTION__ << " " << candidate->sdp_mline_index();
+ RTC_LOG(INFO) << __FUNCTION__ << " " << candidate->sdp_mline_index();
// For loopback test. To save some connecting delay.
if (loopback_) {
if (!peer_connection_->AddIceCandidate(candidate)) {
- LOG(WARNING) << "Failed to apply the received candidate";
+ RTC_LOG(WARNING) << "Failed to apply the received candidate";
}
return;
}
@@ -189,7 +187,7 @@
jmessage[kCandidateSdpMlineIndexName] = candidate->sdp_mline_index();
std::string sdp;
if (!candidate->ToString(&sdp)) {
- LOG(LS_ERROR) << "Failed to serialize candidate";
+ RTC_LOG(LS_ERROR) << "Failed to serialize candidate";
return;
}
jmessage[kCandidateSdpName] = sdp;
@@ -201,12 +199,12 @@
//
void Conductor::OnSignedIn() {
- LOG(INFO) << __FUNCTION__;
+ RTC_LOG(INFO) << __FUNCTION__;
main_wnd_->SwitchToPeerList(client_->peers());
}
void Conductor::OnDisconnected() {
- LOG(INFO) << __FUNCTION__;
+ RTC_LOG(INFO) << __FUNCTION__;
DeletePeerConnection();
@@ -215,16 +213,16 @@
}
void Conductor::OnPeerConnected(int id, const std::string& name) {
- LOG(INFO) << __FUNCTION__;
+ RTC_LOG(INFO) << __FUNCTION__;
// Refresh the list if we're showing it.
if (main_wnd_->current_ui() == MainWindow::LIST_PEERS)
main_wnd_->SwitchToPeerList(client_->peers());
}
void Conductor::OnPeerDisconnected(int id) {
- LOG(INFO) << __FUNCTION__;
+ RTC_LOG(INFO) << __FUNCTION__;
if (id == peer_id_) {
- LOG(INFO) << "Our peer disconnected";
+ RTC_LOG(INFO) << "Our peer disconnected";
main_wnd_->QueueUIThreadCallback(PEER_CONNECTION_CLOSED, NULL);
} else {
// Refresh the list if we're showing it.
@@ -242,21 +240,22 @@
peer_id_ = peer_id;
if (!InitializePeerConnection()) {
- LOG(LS_ERROR) << "Failed to initialize our PeerConnection instance";
+ RTC_LOG(LS_ERROR) << "Failed to initialize our PeerConnection instance";
client_->SignOut();
return;
}
} else if (peer_id != peer_id_) {
RTC_DCHECK(peer_id_ != -1);
- LOG(WARNING) << "Received a message from unknown peer while already in a "
- "conversation with a different peer.";
+ RTC_LOG(WARNING)
+ << "Received a message from unknown peer while already in a "
+ "conversation with a different peer.";
return;
}
Json::Reader reader;
Json::Value jmessage;
if (!reader.parse(message, jmessage)) {
- LOG(WARNING) << "Received unknown message. " << message;
+ RTC_LOG(WARNING) << "Received unknown message. " << message;
return;
}
std::string type;
@@ -268,7 +267,7 @@
// This is a loopback call.
// Recreate the peerconnection with DTLS disabled.
if (!ReinitializePeerConnectionForLoopback()) {
- LOG(LS_ERROR) << "Failed to initialize our PeerConnection instance";
+ RTC_LOG(LS_ERROR) << "Failed to initialize our PeerConnection instance";
DeletePeerConnection();
client_->SignOut();
}
@@ -278,18 +277,18 @@
std::string sdp;
if (!rtc::GetStringFromJsonObject(jmessage, kSessionDescriptionSdpName,
&sdp)) {
- LOG(WARNING) << "Can't parse received session description message.";
+ RTC_LOG(WARNING) << "Can't parse received session description message.";
return;
}
webrtc::SdpParseError error;
webrtc::SessionDescriptionInterface* session_description(
webrtc::CreateSessionDescription(type, sdp, &error));
if (!session_description) {
- LOG(WARNING) << "Can't parse received session description message. "
- << "SdpParseError was: " << error.description;
+ RTC_LOG(WARNING) << "Can't parse received session description message. "
+ << "SdpParseError was: " << error.description;
return;
}
- LOG(INFO) << " Received session description :" << message;
+ RTC_LOG(INFO) << " Received session description :" << message;
peer_connection_->SetRemoteDescription(
DummySetSessionDescriptionObserver::Create(), session_description);
if (session_description->type() ==
@@ -306,22 +305,22 @@
!rtc::GetIntFromJsonObject(jmessage, kCandidateSdpMlineIndexName,
&sdp_mlineindex) ||
!rtc::GetStringFromJsonObject(jmessage, kCandidateSdpName, &sdp)) {
- LOG(WARNING) << "Can't parse received message.";
+ RTC_LOG(WARNING) << "Can't parse received message.";
return;
}
webrtc::SdpParseError error;
std::unique_ptr<webrtc::IceCandidateInterface> candidate(
webrtc::CreateIceCandidate(sdp_mid, sdp_mlineindex, sdp, &error));
if (!candidate.get()) {
- LOG(WARNING) << "Can't parse received candidate message. "
- << "SdpParseError was: " << error.description;
+ RTC_LOG(WARNING) << "Can't parse received candidate message. "
+ << "SdpParseError was: " << error.description;
return;
}
if (!peer_connection_->AddIceCandidate(candidate.get())) {
- LOG(WARNING) << "Failed to apply the received candidate";
+ RTC_LOG(WARNING) << "Failed to apply the received candidate";
return;
}
- LOG(INFO) << " Received candidate :" << message;
+ RTC_LOG(INFO) << " Received candidate :" << message;
return;
}
}
@@ -421,7 +420,7 @@
stream->AddTrack(audio_track);
stream->AddTrack(video_track);
if (!peer_connection_->AddStream(stream)) {
- LOG(LS_ERROR) << "Adding stream to PeerConnection failed";
+ RTC_LOG(LS_ERROR) << "Adding stream to PeerConnection failed";
}
typedef std::pair<std::string,
rtc::scoped_refptr<webrtc::MediaStreamInterface> >
@@ -431,7 +430,7 @@
}
void Conductor::DisconnectFromCurrentPeer() {
- LOG(INFO) << __FUNCTION__;
+ RTC_LOG(INFO) << __FUNCTION__;
if (peer_connection_.get()) {
client_->SendHangUp(peer_id_);
DeletePeerConnection();
@@ -444,7 +443,7 @@
void Conductor::UIThreadCallback(int msg_id, void* data) {
switch (msg_id) {
case PEER_CONNECTION_CLOSED:
- LOG(INFO) << "PEER_CONNECTION_CLOSED";
+ RTC_LOG(INFO) << "PEER_CONNECTION_CLOSED";
DeletePeerConnection();
RTC_DCHECK(active_streams_.empty());
@@ -461,7 +460,7 @@
break;
case SEND_MESSAGE_TO_PEER: {
- LOG(INFO) << "SEND_MESSAGE_TO_PEER";
+ RTC_LOG(INFO) << "SEND_MESSAGE_TO_PEER";
std::string* msg = reinterpret_cast<std::string*>(data);
if (msg) {
// For convenience, we always run the message through the queue.
@@ -475,7 +474,7 @@
pending_messages_.pop_front();
if (!client_->SendToPeer(peer_id_, *msg) && peer_id_ != -1) {
- LOG(LS_ERROR) << "SendToPeer failed";
+ RTC_LOG(LS_ERROR) << "SendToPeer failed";
DisconnectFromServer();
}
delete msg;
@@ -541,7 +540,7 @@
}
void Conductor::OnFailure(const std::string& error) {
- LOG(LERROR) << error;
+ RTC_LOG(LERROR) << error;
}
void Conductor::SendMessage(const std::string& json_object) {