TRNANTOR_LOG_COMPACT - compact logs without source code details(line, file name etc) (#242)

Co-authored-by: Ostropik <Dmytro.OSTROPITSKYI@ingenico.com>
Co-authored-by: antao <antao2002@gmail.com>

Author: 3 people

trantor/tests/LoggerTest.cc

@@ -4,6 +4,7 @@
 int main()
 {
     int i;
+    LOG_COMPACT_DEBUG << "Hello, world!";
     LOG_DEBUG << (float)3.14;
     LOG_DEBUG << (const char)'8';
     LOG_DEBUG << &i;

trantor/utils/Logger.cc

@@ -67,6 +67,7 @@ inline LogStream &operator<<(LogStream &s, const Logger::SourceFile &v)
     s.append(v.data_, v.size_);
     return s;
 }
+
 }  // namespace trantor
 using namespace trantor;
 
@@ -174,6 +175,7 @@ static const char *logLevelStr[Logger::LogLevel::kNumberOfLogLevels] = {
     " ERROR ",
     " FATAL ",
 };
+
 Logger::Logger(SourceFile file, int line)
     : sourceFile_(file), fileLine_(line), level_(kInfo)
 {
@@ -202,6 +204,28 @@ Logger::Logger(SourceFile file, int line, bool)
         logStream_ << strerror_tl(errno) << " (errno=" << errno << ") ";
     }
 }
+
+// LOG_COMPACT
+Logger::Logger() : level_(kInfo)
+{
+    formatTime();
+    logStream_ << T(logLevelStr[level_], 7);
+}
+Logger::Logger(LogLevel level) : level_(level)
+{
+    formatTime();
+    logStream_ << T(logLevelStr[level_], 7);
+}
+Logger::Logger(bool) : level_(kFatal)
+{
+    formatTime();
+    logStream_ << T(logLevelStr[level_], 7);
+    if (errno != 0)
+    {
+        logStream_ << strerror_tl(errno) << " (errno=" << errno << ") ";
+    }
+}
+
 RawLogger::~RawLogger()
 {
     if (index_ < 0)
@@ -221,7 +245,10 @@ RawLogger::~RawLogger()
 }
 Logger::~Logger()
 {
-    logStream_ << T(" - ", 3) << sourceFile_ << ':' << fileLine_ << '\n';
+    if (sourceFile_.data_)
+        logStream_ << T(" - ", 3) << sourceFile_ << ':' << fileLine_ << '\n';
+    else
+        logStream_ << '\n';
     if (index_ < 0)
     {
         auto &oFunc = Logger::outputFunc_();
@@ -240,8 +267,6 @@ Logger::~Logger()
         if (level_ >= kError)
             Logger::flushFunc_(index_)();
     }
-
-    // logStream_.resetBuffer();
 }
 LogStream &Logger::stream()
 {

trantor/utils/Logger.h

@@ -68,8 +68,13 @@ class TRANTOR_EXPORT Logger : public NonCopyable
             }
         }
 
-        explicit SourceFile(const char *filename) : data_(filename)
+        explicit SourceFile(const char *filename = nullptr) : data_(filename)
         {
+            if (!filename)
+            {
+                size_ = 0;
+                return;
+            }
 #ifndef _MSC_VER
             const char *slash = strrchr(filename, '/');
 #else
@@ -89,6 +94,12 @@ class TRANTOR_EXPORT Logger : public NonCopyable
     Logger(SourceFile file, int line, LogLevel level);
     Logger(SourceFile file, int line, bool isSysErr);
     Logger(SourceFile file, int line, LogLevel level, const char *func);
+
+    // LOG_COMPACT only <time><ThreadID><Level>
+    Logger();
+    Logger(LogLevel level);
+    Logger(bool isSysErr);
+
     ~Logger();
     Logger &setIndex(int index)
     {
@@ -304,6 +315,33 @@ class TRANTOR_EXPORT RawLogger : public NonCopyable
 #define LOG_SYSERR_TO(index) \
     trantor::Logger(__FILE__, __LINE__, true).setIndex(index).stream()
 
+// LOG_COMPACT_... begin block
+#define LOG_COMPACT_DEBUG                                               \
+    TRANTOR_IF_(trantor::Logger::logLevel() <= trantor::Logger::kDebug) \
+    trantor::Logger(trantor::Logger::kDebug).stream()
+#define LOG_COMPACT_DEBUG_TO(index)                                     \
+    TRANTOR_IF_(trantor::Logger::logLevel() <= trantor::Logger::kDebug) \
+    trantor::Logger(trantor::Logger::kDebug).setIndex(index).stream()
+#define LOG_COMPACT_INFO                                               \
+    TRANTOR_IF_(trantor::Logger::logLevel() <= trantor::Logger::kInfo) \
+    trantor::Logger().stream()
+#define LOG_COMPACT_INFO_TO(index)                                     \
+    TRANTOR_IF_(trantor::Logger::logLevel() <= trantor::Logger::kInfo) \
+    trantor::Logger().setIndex(index).stream()
+#define LOG_COMPACT_WARN trantor::Logger(trantor::Logger::kWarn).stream()
+#define LOG_COMPACT_WARN_TO(index) \
+    trantor::Logger(trantor::Logger::kWarn).setIndex(index).stream()
+#define LOG_COMPACT_ERROR trantor::Logger(trantor::Logger::kError).stream()
+#define LOG_COMPACT_ERROR_TO(index) \
+    trantor::Logger(trantor::Logger::kError).setIndex(index).stream()
+#define LOG_COMPACT_FATAL trantor::Logger(trantor::Logger::kFatal).stream()
+#define LOG_COMPACT_FATAL_TO(index) \
+    trantor::Logger(trantor::Logger::kFatal).setIndex(index).stream()
+#define LOG_COMPACT_SYSERR trantor::Logger(true).stream()
+#define LOG_COMPACT_SYSERR_TO(index) \
+    trantor::Logger(true).setIndex(index).stream()
+// LOG_COMPACT_... end block
+
 #define LOG_RAW trantor::RawLogger().stream()
 #define LOG_RAW_TO(index) trantor::RawLogger().setIndex(index).stream()