joyful colorized logs

arangodb · fceller · Sep 13, 2017 · Sep 6, 2017 · Sep 6, 2017 · Sep 6, 2017
commit 2d3dc2349660fc5691425fda54c7c083b9f9f37c
diff --git a/lib/ApplicationFeatures/ShellColorsFeature.cpp b/lib/ApplicationFeatures/ShellColorsFeature.cpp
@@ -21,12 +21,16 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "ShellColorsFeature.h"
-#
+
+#ifdef _WIN32
+#include "Basics/win-utils.h"
+#endif
+
 using namespace arangodb;
 using namespace arangodb::basics;
 
 namespace {
-  static char const* NoColor = "";
+static char const* NoColor = "";
 }
 
 char const* ShellColorsFeature::SHELL_COLOR_RED = NoColor;
@@ -82,7 +86,6 @@ void ShellColorsFeature::prepare() {
 
 bool ShellColorsFeature::useColors() {
 #ifdef _WIN32
-  #include "Basics/win-utils.h"
   return terminalKnowsANSIColors();
 #else
   return true;

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -186,7 +186,6 @@ add_library(${LIB_ARANGO} STATIC
   Logger/LogAppender.cpp
   Logger/LogAppenderFile.cpp
   Logger/LogAppenderSyslog.cpp
-  Logger/LogAppenderTty.cpp
   Logger/LogBuffer.cpp
   Logger/LogLevel.cpp
   Logger/LogThread.cpp

diff --git a/lib/Logger/LogAppender.cpp b/lib/Logger/LogAppender.cpp
@@ -29,16 +29,13 @@
 #include "Basics/StringUtils.h"
 #include "Logger/LogAppenderFile.h"
 #include "Logger/LogAppenderSyslog.h"
-#include "Logger/LogAppenderTty.h"
 #include "Logger/Logger.h"
 
 using namespace arangodb;
 using namespace arangodb::basics;
 
 arangodb::Mutex LogAppender::_appendersLock;
 
-std::unique_ptr<LogAppender> LogAppender::_ttyAppender(nullptr);
-
 std::map<size_t, std::vector<std::shared_ptr<LogAppender>>>
     LogAppender::_topics2appenders;
 
@@ -63,18 +60,18 @@ void LogAppender::addAppender(std::string const& definition,
 
   LogTopic* topic = appender.second;
   size_t n = (topic == nullptr) ? LogTopic::MAX_LOG_TOPICS : topic->id();
-  _topics2appenders[n].emplace_back(appender.first);
+  if (std::find(_topics2appenders[n].begin(), _topics2appenders[n].end(), appender.first) == _topics2appenders[n].end()) {
+    _topics2appenders[n].emplace_back(appender.first);
+  }
 }
 
-void LogAppender::addTtyAppender() { _ttyAppender.reset(new LogAppenderTty()); }
-
 std::pair<std::shared_ptr<LogAppender>, LogTopic*> LogAppender::buildAppender(
     std::string const& definition, std::string const& filter) {
   std::vector<std::string> v = StringUtils::split(definition, '=', '\0');
   std::string topicName;
   std::string output;
   std::string contentFilter;
-
+ 
   if (v.size() == 1) {
     output = v[0];
     contentFilter = filter;
@@ -143,20 +140,30 @@ std::pair<std::shared_ptr<LogAppender>, LogTopic*> LogAppender::buildAppender(
   }
 #endif
 
-  // everything else must be file-based logging
-  std::string filename;
+  if (output == "+" || output == "-") {
+    for (auto const& it : _definition2appenders) {
+      if (it.first.first == "+" || it.first.first == "-") {
+        // alreay got a logger for stderr/stdout
+        return {nullptr, nullptr};
+      }
+    }
+  }
 
-  if (output == "-" || output == "+") {
-    filename = output;
+  // everything else must be file-/stream-based logging
+  std::shared_ptr<LogAppenderStream> result;
+
+  if (output == "+") {
+    result.reset(new LogAppenderStderr(contentFilter));
+  } else if (output == "-") {
+    result.reset(new LogAppenderStdout(contentFilter));
   } else if (StringUtils::isPrefix(output, "file://")) {
-    filename = output.substr(7);
+    result.reset(new LogAppenderFile(output.substr(7), contentFilter));
   } else {
     LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "unknown output definition '" << output << "'";
     return {nullptr, nullptr};
   }
 
   try {
-    auto result = std::make_shared<LogAppenderFile>(filename, contentFilter);
     _definition2appenders[key] = result;
 
     return {result, topic};
@@ -171,12 +178,11 @@ void LogAppender::log(LogMessage* message) {
   size_t topicId = message->_topicId;
   std::string const& m = message->_message;
   size_t offset = message->_offset;
-  bool shownStd = false;
 
   MUTEX_LOCKER(guard, _appendersLock);
 
   // output to appender
-  auto output = [&level, &m, &offset, &shownStd](size_t n) -> bool {
+  auto output = [&level, &m, &offset](size_t n) -> bool {
     auto const& it = _topics2appenders.find(n);
     bool shown = false;
 
@@ -185,8 +191,7 @@ void LogAppender::log(LogMessage* message) {
 
       for (auto const& appender : appenders) {
         if (appender->checkContent(m)) {
-          bool s = appender->logMessage(level, m, offset);
-          shownStd |= s;
+          appender->logMessage(level, m, offset);
         }
 
         shown = true;
@@ -208,46 +213,23 @@ void LogAppender::log(LogMessage* message) {
     shown = output(LogTopic::MAX_LOG_TOPICS);
   }
 
-  if (_ttyAppender != nullptr && !shownStd) {
-    _ttyAppender->logMessage(level, m, offset);
-    shown = true;
-  }
-
-  if (!shown) {
-    writeStderr(level, m);
-  }
-
   for (auto const& logger : _loggers) {
     logger(message);
   }
 }
 
-void LogAppender::writeStderr(LogLevel level, std::string const& msg) {
-  if (level == LogLevel::FATAL) {
-    fprintf(stderr, "%s%s%s\n", ShellColorsFeature::SHELL_COLOR_RED, msg.c_str(), ShellColorsFeature::SHELL_COLOR_RESET);
-  } else if (level == LogLevel::ERR) {
-    fprintf(stderr, "%s%s%s\n", ShellColorsFeature::SHELL_COLOR_RED, msg.c_str(), ShellColorsFeature::SHELL_COLOR_RESET);
-    fflush(stderr);
-  } else if (level == LogLevel::WARN) {
-    fprintf(stderr, "%s%s%s\n", ShellColorsFeature::SHELL_COLOR_YELLOW, msg.c_str(), ShellColorsFeature::SHELL_COLOR_RESET);
-  } else {
-    fprintf(stderr, "%s\n", msg.c_str());
-  }
-}
-
 void LogAppender::shutdown() {
   MUTEX_LOCKER(guard, _appendersLock);
 
   LogAppenderSyslog::close();
-  LogAppenderFile::close();
+  LogAppenderFile::closeAll();
 
   _topics2appenders.clear();
   _definition2appenders.clear();
-  _ttyAppender.reset(nullptr);
 }
 
 void LogAppender::reopen() {
   MUTEX_LOCKER(guard, _appendersLock);
 
-  LogAppenderFile::reopen();
+  LogAppenderFile::reopenAll();
 }
diff --git a/lib/Logger/LogAppender.h b/lib/Logger/LogAppender.h
@@ -27,7 +27,6 @@
 #include "Basics/Common.h"
 
    #include "Basics/Mutex.h"
-#include "Basics/tri-strings.h"
 #include "Logger/LogLevel.h"
 
 namespace arangodb {
@@ -40,13 +39,11 @@ class LogAppender {
 
   static void addAppender(std::string const& definition,
                           std::string const& contentFilter = "");
-  static void addTtyAppender();
 
   static std::pair<std::shared_ptr<LogAppender>, LogTopic*> buildAppender(
       std::string const& definition, std::string const& contentFilter);
 
   static void log(LogMessage*);
-  static void writeStderr(LogLevel, std::string const&);
 
   static void reopen();
   static void shutdown();
@@ -67,16 +64,14 @@ class LogAppender {
   }
 
   bool checkContent(std::string const& message) {
-    return _filter.empty() ||
-           TRI_IsContainedString(message.c_str(), _filter.c_str());
+    return _filter.empty() || (message.find(_filter) != std::string::npos);
   }
 
  protected:
   std::string const _filter;  // an optional content filter for log messages
 
  private:
   static Mutex _appendersLock;
-  static std::unique_ptr<LogAppender> _ttyAppender;
   static std::map<size_t, std::vector<std::shared_ptr<LogAppender>>>
       _topics2appenders;
   static std::map<std::pair<std::string, std::string>,