Merge pull request #202 from torbjoernk/feature/no-color

make it possible to disable colorful logging

Author: memmett

CMakeLists.txt

@@ -20,6 +20,7 @@ CMAKE_DEPENDENT_OPTION(pfasst_INSTALL_EXAMPLES "Install example programs." ON
     "pfasst_BUILD_EXAMPLES" OFF)
 option(pfasst_BUILD_TESTS       "Build test suite for PFASST."                            ON )
 option(pfasst_WITH_MPI          "Build with MPI enabled."                                 ON )
+option(pfasst_WITH_COLOR        "Enable colorful logging output."                         ON )
 option(pfasst_WITH_GCC_PROF     "Enable excessive debugging & profiling output with GCC." OFF)
 option(pfasst_DEFAULT_RAND_SEED "Using a hardcoded random seed"                           ON )
 
@@ -43,6 +44,10 @@ if(pfasst_DEFAULT_RAND_SEED)
     set(pfasst_RANDOM_SEED "42")
 endif()
 
+if(NOT ${pfasst_WITH_COLOR})
+    add_definitions(-DNO_COLOR)
+endif()
+
 # Check for C++11 support
 if(${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
     check_cxx_compiler_flag(-std=c++11 HAVE_STD11)
@@ -113,6 +118,10 @@ add_feature_info(MPI
     pfasst_WITH_MPI
     "build with MPI"
 )
+add_feature_info(COLOR
+    pfasst_WITH_COLOR
+    "colorful logging"
+)
 if(${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
     add_feature_info(Profiling
         pfasst_WITH_GCC_PROF

include/pfasst/logging.hpp

@@ -52,6 +52,21 @@ struct OUT
     static const string reset;
 };
 
+#ifdef NO_COLOR
+const string OUT::black = "";
+const string OUT::red = "";
+const string OUT::green = "";
+const string OUT::yellow = "";
+const string OUT::blue = "";
+const string OUT::magenta = "";
+const string OUT::cyan = "";
+const string OUT::white = "";
+
+const string OUT::bold = "";
+const string OUT::underline = "";
+
+const string OUT::reset = "";
+#else
 const string OUT::black = "\033[30m";
 const string OUT::red = "\033[31m";
 const string OUT::green = "\033[32m";
@@ -65,7 +80,7 @@ const string OUT::bold = "\033[1m";
 const string OUT::underline = "\033[4m";
 
 const string OUT::reset = "\033[0m";
-
+#endif
 
 // enable easy logging of STL containers
 #define ELPP_STL_LOGGING
@@ -325,7 +340,11 @@ namespace pfasst
     {
       el::Loggers::addFlag(el::LoggingFlag::LogDetailedCrashReason);
       el::Loggers::addFlag(el::LoggingFlag::DisableApplicationAbortOnFatalLog);
+#ifdef NO_COLOR
+      el::Loggers::removeFlag(el::LoggingFlag::ColoredTerminalOutput);
+#else
       el::Loggers::addFlag(el::LoggingFlag::ColoredTerminalOutput);
+#endif
       el::Loggers::addFlag(el::LoggingFlag::MultiLoggerSupport);
       el::Loggers::addFlag(el::LoggingFlag::CreateLoggerAutomatically);
     }