Fix bug in setting log files

MisterTea · Oct 9, 2018 · 96fa77b · 96fa77b · yiding · Jan 16, 2019
1 parent 30c40fc
commit 96fa77b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/terminal/Terminal.cpp b/src/terminal/Terminal.cpp
@@ -81,11 +81,11 @@ string getIdpasskey() {
 
 void setDaemonLogFile(string idpasskey, string daemonType) {
   string first_idpass_chars = idpasskey.substr(0, 10);
-  string std_file =
+  string logFile =
       string("/tmp/etserver_") + daemonType + "_" + first_idpass_chars;
-  FILE *stdout_stream = freopen("/tmp/etclient_err", "w+", stdout);
+  FILE *stdout_stream = freopen(logFile.c_str(), "w+", stdout);
   setvbuf(stdout_stream, NULL, _IOLBF, BUFSIZ);  // set to line buffering
-  FILE *stderr_stream = freopen("/tmp/etclient_err", "w+", stderr);
+  FILE *stderr_stream = freopen(logFile.c_str(), "w+", stderr);
   setvbuf(stderr_stream, NULL, _IOLBF, BUFSIZ);  // set to line buffering
 }
 

diff --git a/src/terminal/TerminalClient.cpp b/src/terminal/TerminalClient.cpp
@@ -313,9 +313,9 @@ int main(int argc, char** argv) {
 
   strftime(buffer, sizeof(buffer), "%Y-%m-%d_%I-%M", timeinfo);
   string current_time(buffer);
-  const char* err_filename = ("/tmp/etclient_err_" + current_time).c_str();
+  string errFilename = "/tmp/etclient_err_" + current_time;
 
-  FILE* stderr_stream = freopen(err_filename, "w+", stderr);
+  FILE* stderr_stream = freopen(errFilename.c_str(), "w+", stderr);
   setvbuf(stderr_stream, NULL, _IOLBF, BUFSIZ);  // set to line buffering
 
   if (!FLAGS_jumphost.empty()) {

diff --git a/src/terminal/TerminalServer.cpp b/src/terminal/TerminalServer.cpp
@@ -429,10 +429,18 @@ int main(int argc, char **argv) {
       LOG(FATAL) << "Error creating daemon: " << strerror(errno);
     }
 
-    const char *err_filename = "/tmp/etserver_err";
-    FILE *stdout_stream = freopen(err_filename, "w+", stdout);
+    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 errFilename = "/tmp/etclient_err_" + current_time;
+    FILE *stdout_stream = freopen(errFilename.c_str(), "w+", stdout);
     setvbuf(stdout_stream, NULL, _IOLBF, BUFSIZ);  // set to line buffering
-    FILE *stderr_stream = freopen(err_filename, "w+", stderr);
+    FILE *stderr_stream = freopen(errFilename.c_str(), "w+", stderr);
     setvbuf(stderr_stream, NULL, _IOLBF, BUFSIZ);  // set to line buffering
   }
   // Set log file for etserver process here.