More logging fixes

src/base/LogHandler.cpp

@@ -42,19 +42,14 @@ void LogHandler::rolloutHandler(const char *filename, std::size_t size) {
   system(ss.str().c_str());
 }
 
-void LogHandler::setupStdStreams(const string &pathPrefix) {
+void LogHandler::stderrToFile(const string &pathPrefix) {
   time_t rawtime;
   struct tm *timeinfo;
   char buffer[80];
   time(&rawtime);
   timeinfo = localtime(&rawtime);
   strftime(buffer, sizeof(buffer), "%Y-%m-%d_%I-%M", timeinfo);
   string current_time(buffer);
-  {
-    string stdoutFilename = pathPrefix + "_stdout_" + current_time;
-    FILE *stdout_stream = freopen(stdoutFilename.c_str(), "w", stdout);
-    setvbuf(stdout_stream, NULL, _IOLBF, BUFSIZ);  // set to line buffering
-  }
   {
     string stderrFilename = pathPrefix + "_stderr_" + current_time;
     FILE *stderr_stream = freopen(stderrFilename.c_str(), "w", stderr);

src/base/LogHandler.hpp

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

src/htm/HtmClientMain.cpp

@@ -53,6 +53,8 @@ int main(int argc, char** argv) {
   // default max log file size is 20MB for etserver
   string maxlogsize = "20971520";
   LogHandler::setupLogFile(&defaultConf, "/tmp/htm.log", maxlogsize);
+  // Redirect std streams to a file
+  LogHandler::stderrToFile("/tmp/htm");
 
   // Reconfigure default logger to apply settings above
   el::Loggers::reconfigureLogger("default", defaultConf);

src/htm/HtmServerMain.cpp

@@ -20,7 +20,8 @@ int main(int argc, char **argv) {
   // default max log file size is 20MB for etserver
   string maxlogsize = "20971520";
   LogHandler::setupLogFile(&defaultConf, "/tmp/htmd.log", maxlogsize);
-  LogHandler::setupStdStreams("/tmp/htm");
+  // Redirect std streams to a file
+  LogHandler::stderrToFile("/tmp/htmd");
 
   // Reconfigure default logger to apply settings above
   el::Loggers::reconfigureLogger("default", defaultConf);

src/terminal/Terminal.cpp

@@ -83,8 +83,9 @@ void setDaemonLogFile(string idpasskey, string daemonType) {
   if (!FLAGS_logtostdout) {
     string first_idpass_chars = idpasskey.substr(0, 10);
     string logFile =
-        string("/tmp/etserver_") + daemonType + "_" + first_idpass_chars;
-    LogHandler::setupStdStreams(logFile);
+        string("/tmp/etterminal_") + daemonType + "_" + first_idpass_chars;
+    // Redirect std streams to a file
+    LogHandler::stderrToFile(logFile);
   }
 }
 

src/terminal/TerminalClient.cpp

@@ -185,7 +185,7 @@ int main(int argc, char** argv) {
   } else {
     defaultConf.setGlobally(el::ConfigurationType::ToStandardOutput, "false");
     // Redirect std streams to a file
-    LogHandler::setupStdStreams("/tmp/etclient");
+    LogHandler::stderrToFile("/tmp/etclient");
   }
 
   // silent Flag, since etclient doesn't read /etc/et.cfg file

src/terminal/TerminalServer.cpp

@@ -208,7 +208,6 @@ void runTerminal(shared_ptr<ServerClientConnection> serverClientState) {
         serverClientState->writeProto(pwd);
       }
 
-      VLOG(3) << "ServerClientFd: " << serverClientFd;
       if (serverClientFd > 0 && FD_ISSET(serverClientFd, &rfd)) {
         VLOG(3) << "ServerClientFd is selected";
         while (serverClientState->hasData()) {
@@ -380,7 +379,7 @@ int main(int argc, char **argv) {
   } else {
     defaultConf.setGlobally(el::ConfigurationType::ToStandardOutput, "false");
     // Redirect std streams to a file
-    LogHandler::setupStdStreams("/tmp/etserver");
+    LogHandler::stderrToFile("/tmp/etserver");
   }
 
   // default max log file size is 20MB for etserver

test/Main.cpp

@@ -13,7 +13,7 @@ int main(int argc, char **argv) {
 
   // Setup easylogging configurations
   el::Configurations defaultConf =
-      et::LogHandler::SetupLogHandler(&argc, &argv);
+      et::LogHandler::setupLogHandler(&argc, &argv);
   defaultConf.setGlobally(el::ConfigurationType::ToFile, "false");
   el::Loggers::setVerboseLevel(FLAGS_v);