remove color symbols from common logs

Author: Samat Gaynutdinov

docker/release_distribution_scripts/utbot_run_system.sh

@@ -119,18 +119,18 @@ then
 
   #Server-specific parameters
   UTBOT_EXECUTABLE_PATH=$UTBOT_BINARIES_FOLDER/$UTBOT_PROCESS_PATTERN
-  UTBOT_STDOUT_LOG_FILE=$UTBOT_LOGS_FOLDER/logs/$UTBOT_PROCESS_PATTERN-$(now).log
   UTBOT_SERVER_OPTIONS="$UTBOT_MODE --port $UTBOT_PORT --log=$UTBOT_LOGS_FOLDER --tmp=$UTBOT_ALL"
+  UTBOT_STDOUT_LOG_FILE=$UTBOT_LOGS_FOLDER/logs/"latest.log"
 
   log "Starting a new server process; logs are written into [$UTBOT_LOGS_FOLDER] folder"
-  start_process $UTBOT_PROCESS_PATTERN $UTBOT_EXECUTABLE_PATH "$UTBOT_SERVER_OPTIONS" $UTBOT_STDOUT_LOG_FILE $UTBOT_PID_FILE
+  start_process "$UTBOT_PROCESS_PATTERN" "$UTBOT_EXECUTABLE_PATH" "$UTBOT_SERVER_OPTIONS" "$UTBOT_STDOUT_LOG_FILE" "$UTBOT_PID_FILE"
   repeats=0
-  while [ $repeats -le 20 ] && [ $(wc -l < $UTBOT_STDOUT_LOG_FILE) -lt 5 ]
+  while [ $repeats -le 20 ] && [ $(wc -l < $UTBOT_STDOUT_LOG_FILE) -lt 6 ]
   do
     sleep 0.1
     repeats=$(( repeats + 1 ))
   done
-  head $UTBOT_STDOUT_LOG_FILE -n 5
+  head $UTBOT_STDOUT_LOG_FILE -n 6
 fi
 
 if [ "$1" = "cli" ]

docker/release_distribution_scripts/utbot_scripts/common_functions.sh

@@ -27,10 +27,10 @@ log(){
 #   - $5 - PID file to be created
 start_process(){
   log "INFO Starting new [$1] process right now"
-  nohup $2 $3 >> $4 2>&1 &
+  nohup $2 $3 > /dev/null 2>&1 &
   local PROCESS_PID=$!
   echo $PROCESS_PID > $5
-  log "INFO New [$1] instance with pid [$PROCESS_PID] has been started, process options are [$3], pid file created: [$5]; STDOUT and STDERR redirected to [$4]"
+  log "INFO New [$1] instance with pid [$PROCESS_PID] has been started, process options are [$3], pid file created: [$5]; logs write to [$4]"
 }
 
 # Function arguments:

server/src/Paths.cpp

@@ -6,6 +6,7 @@
 
 #include "ProjectContext.h"
 #include "utils/StringUtils.h"
+#include "utils/CLIUtils.h"
 
 #include "loguru.h"
 

server/src/Paths.h

@@ -130,6 +130,11 @@ namespace Paths {
         return logPath / "logs";
     }
 
+    static inline fs::path getUtbotLogAllFilePath() {
+        const static std::string filename = "utbot-" + TimeUtils::getCurrentTimeStr() + ".log";
+        return logPath / Paths::getBaseLogDir() / filename;
+    }
+
     static inline fs::path getClientLogDir(const string &client) {
         return getBaseLogDir() / client;
     }
@@ -152,6 +157,10 @@ namespace Paths {
         return execLogPath;
     }
 
+    static inline fs::path getSymLinkPathToLogLatest() {
+        return Paths::getBaseLogDir() / "latest.log";
+    }
+
     //endregion
 
     static inline fs::path getTmpDir(const string &projectName) {

server/src/Server.cpp

@@ -45,7 +45,8 @@ const string Server::gtestLogPrefix = "gtestLogTo";
 
 void Server::run(uint16_t customPort) {
     LOG_S(INFO) << "UnitTestBot Server, build " << UTBOT_BUILD_NUMBER;
-    LOG_S(INFO) << "Log path: " << Paths::logPath;
+    LOG_S(INFO) << "Logs directory: " << Paths::logPath;
+    LOG_S(INFO) << "Latest log path: " << Paths::getUtbotLogAllFilePath();
     LOG_S(INFO) << "Tmp directory path: " << Paths::tmpPath;
     LOG_S(INFO) << "Executable path: " << fs::current_path();
 

server/src/utils/CLIUtils.cpp

@@ -36,7 +36,14 @@ void CLIUtils::setupLogger(const std::string &logPath,
     if (!threadView) {
         loguru::g_preamble_thread = false;
     }
-    setOptPath(logPath, Paths::logPath);
+
+    CLIUtils::setOptPath(logPath, Paths::logPath);
+    const fs::path symLink = Paths::getSymLinkPathToLogLatest();
+    const std::string logfile_path_string = std::string(Paths::getUtbotLogAllFilePath());
+    loguru::add_file(logfile_path_string.data(), loguru::Append, loguru::Verbosity_MAX);
+    std::filesystem::remove(symLink.string());
+    std::filesystem::create_symlink(logfile_path_string, symLink.string());
+
     setStderrVerbosity(verbosity);
 }
 
@@ -241,7 +248,6 @@ void CLIUtils::parse(int argc, char **argv, CLI::App &app) {
     } else {
         CLIUtils::setupLogger(serverCommandOptions.getLogPath(),
                               serverCommandOptions.getVerbosity());
-        CLIUtils::setOptPath(serverCommandOptions.getLogPath(), Paths::logPath);
         CLIUtils::setOptPath(serverCommandOptions.getTmpPath(), Paths::tmpPath);
         Server server;
         if (serverCommandOptions.getPort() != 0) {

server/src/utils/TimeUtils.cpp

@@ -36,4 +36,12 @@ namespace TimeUtils {
     systemClockTimePoint convertFileToSystemClock(const fs::file_time_type &fTime) {
         return std::chrono::system_clock::from_time_t(to_time_t(fTime));
     }
-}
+
+    std::string getCurrentTimeStr() {
+        time_t t = std::time(nullptr);
+        tm tm = *std::localtime(&t);
+        std::ostringstream oss;
+        oss << std::put_time(&tm, "%Y%m%d%H%M%S");
+        return oss.str();
+    }
+}

server/src/utils/TimeUtils.h

@@ -37,6 +37,8 @@ namespace TimeUtils {
     systemClockTimePoint convertFileToSystemClock(const fs::file_time_type& fTime);
 
     string getDate();
+
+    std::string getCurrentTimeStr();
 }
 
 #endif //UNITTESTBOT_TIMEUTIL_H