logging: add '--quiet/-q' flag to disable stdout

by default, everything gets written to stdout but by specifying '-q'
('--quiet') flag to the executable, stdout is disabled completely

Author: torbjoernk

include/pfasst.hpp

@@ -30,11 +30,11 @@ namespace pfasst
       cerr << "PFASST::init() : 'with_mpi' flag used without enabling MPI" << endl;
 #endif
     }
+    config::read_commandline(argc, argv);
     log::start_log(argc, argv);
     if (logs) {
       logs();
     }
-    config::read_commandline(argc, argv);
   }
 } // ::pfasst
 

include/pfasst/config.hpp

@@ -115,6 +115,7 @@ namespace pfasst
     static inline void init()
     {
       options::add_option("Global", "help,h", "display this help message");
+      options::add_option("Global", "quiet,q", "don't log to stdout");
 
       options::add_option<double>("Duration", "dt", "time step size");
       options::add_option<double>("Duration", "tend", "final time of simulation");

include/pfasst/logging.hpp

@@ -168,23 +168,26 @@ namespace pfasst
         id2print.append(LOGGER_ID_LENGTH - id_length, ' ');
       }
 
+      el::Configurations* default_conf = \
+        const_cast<el::Configurations*>(el::Loggers::defaultConfigurations());
+
       el::Logger* logger = el::Loggers::getLogger(id);
       el::Configurations* conf = logger->configurations();
       conf->setGlobally(el::ConfigurationType::MillisecondsWidth,
-                        PFASST_LOGGER_DEFAULT_GLOBAL_MILLISECOND_WIDTH);
+                        default_conf->get(el::Level::Info,
+                                          el::ConfigurationType::MillisecondsWidth)->value());
+      conf->setGlobally(el::ConfigurationType::ToStandardOutput,
+                        default_conf->get(el::Level::Info,
+                                          el::ConfigurationType::ToStandardOutput)->value());
 #ifdef WITH_MPI
       int initialized = 0;
       MPI_Initialized(&initialized);
       assert((bool)initialized);
       int rank = 0;
       MPI_Comm_rank(MPI_COMM_WORLD, &rank);
       conf->setGlobally(el::ConfigurationType::ToFile, "true");
-      conf->setGlobally(el::ConfigurationType::ToStandardOutput, "false");
       conf->setGlobally(el::ConfigurationType::Filename,
                         string("mpi_run_") + to_string(rank) + string(".log"));
-#else
-      conf->setGlobally(el::ConfigurationType::ToFile, "false");
-      conf->setGlobally(el::ConfigurationType::ToStandardOutput, "true");
 #endif
       conf->set(el::Level::Info, el::ConfigurationType::Format,
                 TIMESTAMP + INFO_COLOR + "[" + id2print + ", " + LEVEL  + " " + MESSAGE + OUT::reset);
@@ -209,22 +212,24 @@ namespace pfasst
       el::Configurations defaultConf;
       defaultConf.setToDefault();
 
+      if (!pfasst::config::options::get_instance().get_variables_map().count("quiet")) {
+        defaultConf.setGlobally(el::ConfigurationType::ToStandardOutput, "true");
+      } else {
+        defaultConf.setGlobally(el::ConfigurationType::ToStandardOutput, "false");
+      }
 #ifdef WITH_MPI
       int initialized = 0;
       MPI_Initialized(&initialized);
       assert((bool)initialized);
       int rank = 0;
       MPI_Comm_rank(MPI_COMM_WORLD, &rank);
       defaultConf.setGlobally(el::ConfigurationType::ToFile, "true");
-      defaultConf.setGlobally(el::ConfigurationType::ToStandardOutput, "false");
       defaultConf.setGlobally(el::ConfigurationType::Filename,
                               string("mpi_run_") + to_string(rank) + string(".log"));
-#else
-      defaultConf.setGlobally(el::ConfigurationType::ToFile, "false");
-      defaultConf.setGlobally(el::ConfigurationType::ToStandardOutput, "true");
 #endif
-      defaultConf.setGlobally(el::ConfigurationType::MillisecondsWidth, PFASST_LOGGER_DEFAULT_GLOBAL_MILLISECOND_WIDTH);
-      el::Loggers::reconfigureAllLoggers(defaultConf);
+      defaultConf.setGlobally(el::ConfigurationType::MillisecondsWidth,
+                              PFASST_LOGGER_DEFAULT_GLOBAL_MILLISECOND_WIDTH);
+      el::Loggers::setDefaultConfigurations(defaultConf, true);
 
       add_custom_logger("default");
       add_custom_logger("Controller");