From ecbf76e94bc02db0e982eac117de97a580a5d82e Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Fri, 31 Jul 2015 23:34:54 -0700
Subject: [PATCH] Update tcpsockets classes to use log framework.

---
 src/tcpsockets/TCPAcceptor.cpp  |  8 +++++---
 src/tcpsockets/TCPConnector.cpp | 11 ++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/tcpsockets/TCPAcceptor.cpp b/src/tcpsockets/TCPAcceptor.cpp
index 607e428537..4fbd233d32 100644
--- a/src/tcpsockets/TCPAcceptor.cpp
+++ b/src/tcpsockets/TCPAcceptor.cpp
@@ -29,6 +29,8 @@
 #include <netinet/in.h>
 #include <unistd.h>
 
+#include "Log.h"
+
 TCPAcceptor::TCPAcceptor(int port, const char* address)
     : m_lsd(0),
       m_port(port),
@@ -63,13 +65,13 @@ int TCPAcceptor::start() {
 
   int result = bind(m_lsd, (struct sockaddr*)&address, sizeof(address));
   if (result != 0) {
-    perror("bind() failed");
+    ERROR("bind() failed: " << strerror(errno));
     return result;
   }
 
   result = listen(m_lsd, 5);
   if (result != 0) {
-    perror("listen() failed");
+    ERROR("listen() failed: " << strerror(errno));
     return result;
   }
   m_listening = true;
@@ -89,7 +91,7 @@ std::unique_ptr<TCPStream> TCPAcceptor::accept() {
   std::memset(&address, 0, sizeof(address));
   int sd = ::accept(m_lsd, (struct sockaddr*)&address, &len);
   if (sd < 0) {
-    if (!m_shutdown) perror("accept() failed");
+    if (!m_shutdown) ERROR("accept() failed: " << strerror(errno));
     return nullptr;
   }
   return std::unique_ptr<TCPStream>(new TCPStream(sd, &address));
diff --git a/src/tcpsockets/TCPConnector.cpp b/src/tcpsockets/TCPConnector.cpp
index aebe2176a7..6f08eec3dd 100644
--- a/src/tcpsockets/TCPConnector.cpp
+++ b/src/tcpsockets/TCPConnector.cpp
@@ -31,6 +31,8 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
+#include "Log.h"
+
 static int ResolveHostName(const char* hostname, struct in_addr* addr) {
   struct addrinfo* res;
 
@@ -54,7 +56,7 @@ std::unique_ptr<TCPStream> TCPConnector::connect(const char* server, int port) {
   }
   int sd = socket(AF_INET, SOCK_STREAM, 0);
   if (::connect(sd, (struct sockaddr*)&address, sizeof(address)) != 0) {
-    perror("connect() failed");
+    DEBUG("connect() failed: " << strerror(errno));
     return nullptr;
   }
   return std::unique_ptr<TCPStream>(new TCPStream(sd, &address));
@@ -97,16 +99,15 @@ std::unique_ptr<TCPStream> TCPConnector::connect(const char* server, int port,
         len = sizeof(int);
         getsockopt(sd, SOL_SOCKET, SO_ERROR, (void*)(&valopt), &len);
         if (valopt) {
-          fprintf(stderr, "connect() error %d - %s\n", valopt,
-                  strerror(valopt));
+          DEBUG("connect() error " << valopt << " - " << strerror(valopt));
         }
         // connection established
         else
           result = 0;
       } else
-        fprintf(stderr, "connect() timed out\n");
+        DEBUG("connect() timed out");
     } else
-      fprintf(stderr, "connect() error %d - %s\n", errno, strerror(errno));
+      DEBUG("connect() error " << errno << " - " << strerror(errno));
   }
 
   // Return socket to blocking mode