From 74a59a6f1a3e232619a20034edf7a333ad029b03 Mon Sep 17 00:00:00 2001 From: Dennis Brentjes Date: Sat, 1 Oct 2016 10:08:30 +0200 Subject: Removes all tracing log calls. --- libcmix-network/client.cpp | 3 --- node/node.cpp | 16 +++------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/libcmix-network/client.cpp b/libcmix-network/client.cpp index d8e79d7..0c3c432 100644 --- a/libcmix-network/client.cpp +++ b/libcmix-network/client.cpp @@ -42,7 +42,6 @@ void Client::send(std::string message) { }; auto handler = [](boost::system::error_code const& ec, std::size_t bytes_transferred) { - BOOST_LOG_TRIVIAL(trace) << "sent message of " << bytes_transferred << " bytes"; if(ec) { BOOST_LOG_TRIVIAL(fatal) << ec; throw std::runtime_error("unable to send message"); @@ -86,14 +85,12 @@ void Client::handle_receive_size(Client::MessageHandler message_handler, const e void Client::handle_receive_message(MessageHandler message_handler, const error_code &ec, size_t read_bytes) { - BOOST_LOG_TRIVIAL(trace) << "handling receive of: " << read_bytes << " bytes"; if(!ec) { buffer.commit(read_bytes); std::istream is(&buffer); is.unsetf(std::ios::skipws); std::vector data(std::istream_iterator(is), {}); - BOOST_LOG_TRIVIAL(trace) << "data.size(): " << data.size(); message_handler(data); } else { BOOST_LOG_TRIVIAL(error) << ec; diff --git a/node/node.cpp b/node/node.cpp index b8416e1..8327269 100644 --- a/node/node.cpp +++ b/node/node.cpp @@ -21,7 +21,6 @@ Node::Node(ListenSettings const& listen_settings, NodeNetworkSettings network_se GOOGLE_PROTOBUF_VERIFY_VERSION; auto on_connect = [this, network_settings](){ - BOOST_LOG_TRIVIAL(trace) << "is first: " << std::boolalpha << network_settings.is_first; if(network_settings.is_first) { start_initialisation(); } @@ -53,28 +52,19 @@ void Node::accept_handler(boost::asio::ip::tcp::socket&& socket) void Node::start_initialisation() { initialization init; init.set_public_share(keypair.pub, keypair.pub_len); - - BOOST_LOG_TRIVIAL(trace) << "length of keypair.pub: " << keypair.pub_len; - + std::string message; init.SerializeToString(&message); - BOOST_LOG_TRIVIAL(trace) << "init: " << init.DebugString(); - BOOST_LOG_TRIVIAL(trace) << "size: " << message.size(); - BOOST_LOG_TRIVIAL(trace) << "raw: " << message; + next_node.send(message); auto f = [this](std::vector bytes) { if(network_settings.is_first) { - BOOST_LOG_TRIVIAL(trace) << "bytes.size(): " << bytes.size(); - BOOST_LOG_TRIVIAL(trace) << "raw2: " << std::string(bytes.begin(), bytes.end()); - initialization init; init.ParseFromArray(bytes.data(), bytes.size()); std::string share = init.public_share(); network_pub_key = std::vector(share.begin(), share.end()); - - BOOST_LOG_TRIVIAL(trace) << "The network pub_key: " << init.DebugString(); - + start_precomputation(); } else { mpz_t shared; -- cgit v1.2.3-70-g09d2