From 8264fc1d1ae9befd321fc072d2f3266b50bac819 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Wed, 13 Jun 2012 23:35:45 -0700 Subject: [PATCH] Remove references to LOG_TRIVIAL. --- src/Application.cpp | 1 - src/Peer.cpp | 9 ++++----- src/PeerDoor.cpp | 2 +- src/RPCDoor.cpp | 2 +- src/RPCServer.cpp | 1 - 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Application.cpp b/src/Application.cpp index 019ea23a05..22e212c5d4 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -127,7 +127,6 @@ void Application::run() // temporary mIOService.run(); // This blocks - //BOOST_LOG_TRIVIAL(info) << "Done."; std::cout << "Done." << std::endl; } diff --git a/src/Peer.cpp b/src/Peer.cpp index f540186fee..54e6f2d0c4 100644 --- a/src/Peer.cpp +++ b/src/Peer.cpp @@ -221,7 +221,6 @@ void Peer::connected(const boost::system::error_code& error) // Not redundant ip and port, add to connection list. std::cerr << "Remote peer: accepted: " << strIp << " " << iPort << std::endl; - //BOOST_LOG_TRIVIAL(info) << "Connected to Peer."; mIpPort = make_pair(strIp, iPort); assert(!mIpPort.first.empty()); @@ -293,7 +292,7 @@ void Peer::handle_read_header(const boost::system::error_code& error) else { detach("hrh2"); - std::cerr << "Peer::handle_read_header: Error: " << error << std::endl; //else BOOST_LOG_TRIVIAL(info) << "Error: " << error; + std::cerr << "Peer::handle_read_header: Error: " << error << std::endl; } } @@ -307,7 +306,7 @@ void Peer::handle_read_body(const boost::system::error_code& error) else { detach("hrb"); - std::cerr << "Peer::handle_read_body: Error: " << error << std::endl; //else BOOST_LOG_TRIVIAL(info) << "Error: " << error; + std::cerr << "Peer::handle_read_body: Error: " << error << std::endl; } } @@ -336,7 +335,7 @@ void Peer::processReadBuffer() newcoin::TMHello msg; if(msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) recvHello(msg); - else std::cerr << "parse error: " << type << std::endl; //else BOOST_LOG_TRIVIAL(info) << "Error: " << error; + else std::cerr << "parse error: " << type << std::endl; } break; @@ -511,7 +510,7 @@ void Peer::processReadBuffer() break; default: - std::cerr << "Unknown Msg: " << type << std::endl; //else BOOST_LOG_TRIVIAL(info) << "Error: " << error; + std::cerr << "Unknown Msg: " << type << std::endl; } } } diff --git a/src/PeerDoor.cpp b/src/PeerDoor.cpp index 60f40b9693..b10e17110d 100644 --- a/src/PeerDoor.cpp +++ b/src/PeerDoor.cpp @@ -54,7 +54,7 @@ void PeerDoor::handleConnect(Peer::pointer new_connection, { new_connection->connected(error); } - else cout << "Error: " << error; // BOOST_LOG_TRIVIAL(info) << "Error: " << error; + else cout << "Error: " << error; startListening(); } diff --git a/src/RPCDoor.cpp b/src/RPCDoor.cpp index 4234d79677..510e46f48c 100644 --- a/src/RPCDoor.cpp +++ b/src/RPCDoor.cpp @@ -45,7 +45,7 @@ void RPCDoor::handleConnect(RPCServer::pointer new_connection, new_connection->connected(); } - else cout << "Error: " << error;//BOOST_LOG_TRIVIAL(info) << "Error: " << error; + else cout << "Error: " << error; startListening(); } diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp index 4d90800d14..26cf3c0228 100644 --- a/src/RPCServer.cpp +++ b/src/RPCServer.cpp @@ -101,7 +101,6 @@ Json::Value RPCServer::RPCError(int iError) void RPCServer::connected() { - //BOOST_LOG_TRIVIAL(info) << "RPC request"; std::cout << "RPC request" << std::endl; mSocket.async_read_some(boost::asio::buffer(mReadBuffer),