replace cout with easylogging custom logger to avoid race conditions (#…

…337)

src/base/ClientConnection.cpp

@@ -39,8 +39,9 @@ bool ClientConnection::connect() {
       // survived.
       STERROR << "Error connecting to server: " << response.status() << ": "
               << response.error();
-      cout << "Error connecting to server: " << response.status() << ": "
-           << response.error() << endl;
+      CLOG(INFO, "stdout") << "Error connecting to server: "
+                           << response.status() << ": " << response.error()
+                           << endl;
       string s = string("Error connecting to server: ") +
                  to_string(response.status()) + string(": ") + response.error();
       throw std::runtime_error(s.c_str());
@@ -114,8 +115,9 @@ void ClientConnection::pollReconnect() {
           if (response.status() != RETURNING_CLIENT) {
             STERROR << "Error reconnecting to server: " << response.status()
                     << ": " << response.error();
-            cout << "Error reconnecting to server: " << response.status()
-                 << ": " << response.error() << endl;
+            CLOG(INFO, "stdout")
+                << "Error reconnecting to server: " << response.status() << ": "
+                << response.error() << endl;
             socketHandler->close(newSocketFd);
           } else {
             recover(newSocketFd);

src/base/LogHandler.cpp

@@ -5,7 +5,8 @@ INITIALIZE_EASYLOGGINGPP
 namespace et {
 void interruptSignalHandler(int signum) {
   STERROR << "Got interrupt";
-  cout << endl << "Got interrupt (perhaps ctrl+c?).  Exiting." << endl;
+  CLOG(INFO, "stdout") << endl
+                       << "Got interrupt (perhaps ctrl+c?).  Exiting." << endl;
   ::exit(signum);
 }
 
@@ -63,4 +64,16 @@ string LogHandler::stderrToFile(const string &pathPrefix) {
   setvbuf(stderr_stream, NULL, _IOLBF, BUFSIZ);  // set to line buffering
   return stderrFilename;
 }
+
+void LogHandler::setupStdoutLogger() {
+  el::Logger *stdoutLogger = el::Loggers::getLogger("stdout");
+  // Easylogging configurations
+  el::Configurations stdoutConf;
+  stdoutConf.setToDefault();
+  // Values are always std::string
+  stdoutConf.setGlobally(el::ConfigurationType::Format, "%msg");
+  stdoutConf.setGlobally(el::ConfigurationType::ToStandardOutput, "true");
+  stdoutConf.setGlobally(el::ConfigurationType::ToFile, "false");
+  el::Loggers::reconfigureLogger(stdoutLogger, stdoutConf);
+}
 }  // namespace et

src/base/LogHandler.hpp

@@ -11,6 +11,7 @@ class LogHandler {
                            string maxlogsize = "20971520");
   static void rolloutHandler(const char *filename, std::size_t size);
   static string stderrToFile(const string &pathPrefix);
+  static void setupStdoutLogger();
 };
 }  // namespace et
 #endif  // __ET_LOG_HANDLER__

src/base/TcpSocketHandler.cpp

@@ -199,9 +199,9 @@ set<int> TcpSocketHandler::listen(const SocketEndpoint &endpoint) {
       STERROR << "Error binding " << p->ai_family << "/" << p->ai_socktype
               << "/" << p->ai_protocol << ": " << localErrno << " "
               << strerror(localErrno);
-      cout << "Error binding " << p->ai_family << "/" << p->ai_socktype << "/"
-           << p->ai_protocol << ": " << localErrno << " "
-           << strerror(localErrno) << endl;
+      CLOG(INFO, "stdout") << "Error binding " << p->ai_family << "/"
+                           << p->ai_socktype << "/" << p->ai_protocol << ": "
+                           << localErrno << " " << strerror(localErrno) << endl;
       stringstream oss;
       oss << "Error binding port " << port << ": " << localErrno << " "
           << strerror(localErrno);

src/htm/HtmClientMain.cpp

@@ -38,7 +38,7 @@ int main(int argc, char** argv) {
 
   auto result = options.parse(argc, argv);
   if (result.count("help")) {
-    cout << options.help({}) << endl;
+    CLOG(INFO, "stdout") << options.help({}) << endl;
     exit(0);
   }
 
@@ -94,7 +94,8 @@ int main(int argc, char** argv) {
   }
 
   // This means we are the client to the daemon
-  std::this_thread::sleep_for(std::chrono::microseconds(10*1000));  // Sleep for 10ms to let the daemon come alive
+  std::this_thread::sleep_for(std::chrono::microseconds(
+      10 * 1000));  // Sleep for 10ms to let the daemon come alive
   shared_ptr<SocketHandler> socketHandler(new PipeSocketHandler());
   SocketEndpoint pipeEndpoint;
   pipeEndpoint.set_name(HtmServer::getPipeName());