Final Variant never have a log4cpp instance it just logs everything apparently

Author: StevenAWhite

projects/biogears/libBiogears/include/biogears/cdm/utils/Logger.h

@@ -88,6 +88,7 @@ class BIOGEARS_API Logger {
   void ResetLogFile(const char* logFilename , const char* working_dir = Loggable::empty_cStr);
 
   void SetLogLevel(log4cpp::Priority::Value priority);
+  void SetConsoleLogLevel(log4cpp::Priority::Value priority);
   log4cpp::Priority::Value GetLogLevel();
 
   virtual void SetLogTime(const SEScalarTime* time);

projects/biogears/libBiogears/src/cdm/engine/PhysiologyEngineDynamicStabilization.cpp

@@ -170,7 +170,8 @@ bool PhysiologyEngineDynamicStabilization::Stabilize(PhysiologyEngine& engine, c
 }
 //-----------------------------------------------------------------------------
 PhysiologyEngineDynamicStabilizer::PhysiologyEngineDynamicStabilizer(double timeStep_s, const PhysiologyEngineDynamicStabilizationCriteria& criteria)
-  : m_properties(criteria.GetPropertyConvergence())
+  : Loggable(criteria.GetLogger())
+  , m_properties(criteria.GetPropertyConvergence())
 {
   m_dT_s = timeStep_s;
   m_totTime_s = 0;
@@ -228,11 +229,11 @@ void PhysiologyEngineDynamicStabilizer::Converge()
   if (!m_converged && m_passTime_s >= m_covTime_s) { // We have converged
     m_converged = true;
     if (m_hasOptionalProperties)
-      Info("We have passed required convergence criteria, attempting to converge optional properties from multiple conditions.");
+      Warning("We have passed required convergence criteria, attempting to converge optional properties from multiple conditions.");
   }
   if (m_converged && m_optsPassTime_s >= m_covTime_s) { // We have converged optional props
     m_convergedOptional = true;
-    Info("We have passed required and optional convergence criteria.");
+    Warning("We have passed required and optional convergence criteria.");
   }
 
   if (m_totTime_s > m_maxTime_s) {

projects/biogears/libBiogears/src/cdm/utils/Logger.cpp

@@ -43,15 +43,16 @@ Logger::Logger(const char* logFilename, const char* working_dir)
 void Logger::LogToConsole(bool log_to_console)
 {
   if (log_to_console) {
-    m_Log->addAppender(m_ConsoleAppender);
+    m_Log->addAppender(*m_ConsoleAppender);
   } else {
     m_Log->removeAppender(m_ConsoleAppender);
   }
 }
 
 void Logger::ResetLogFile(const std::string& logFilename, const std::string& working_dir)
 {
-  log4cpp::Category& category = log4cpp::Category::getInstance(logFilename);
+  std::string key = logFilename; if( logFilename.empty()) { key = "biogears_logger"; }
+  log4cpp::Category& category = log4cpp::Category::getInstance(key);
   m_Log = &category;
   m_Log->removeAllAppenders();
   m_Log->setPriority(log4cpp::Priority::INFO);
@@ -77,10 +78,11 @@ void Logger::ResetLogFile(const std::string& logFilename, const std::string& wor
 
   m_ConsoleAppender = log4cpp::Appender::getAppender(logFilename + "_console");
   if (m_ConsoleAppender == nullptr) {
-    m_ConsoleAppender = new log4cpp::OstreamAppender("console", &std::cout);
+    m_ConsoleAppender = new log4cpp::OstreamAppender(logFilename + "_console", &std::cout);
     log4cpp::PatternLayout* cLayout = new log4cpp::PatternLayout();
     cLayout->setConversionPattern("%d [%p] %m%n");
     m_ConsoleAppender->setLayout(cLayout);
+    m_ConsoleAppender->setThreshold(log4cpp::Priority::INFO);
   }
   LogToConsole(true);
 }
@@ -101,8 +103,17 @@ void Logger::SetLogTime(const SEScalarTime* time) { m_time = time; }
 // This function will change the priority of the logger
 void Logger::SetLogLevel(log4cpp::Priority::Value priority)
 {
-  if (m_Log)
+  if (m_Log) {
     m_Log->setPriority(priority);
+  }
+}
+
+// This function will change the priority of the m_ConsoleAppender
+void Logger::SetConsoleLogLevel(log4cpp::Priority::Value priority)
+{
+  if (m_ConsoleAppender) {
+    m_ConsoleAppender->setThreshold(priority);
+  }
 }
 
 // This function will return the priority of the logger

projects/cmd_bio/src/exec/Driver.cpp

@@ -152,10 +152,10 @@ void Driver::queue_Scenario(Executor exec)
     std::string results_file = base_file_name + "Results.csv";
 
     std::unique_ptr<PhysiologyEngine> eng;
+    Logger console_logger;
     Logger file_logger(ex.Computed() + parent_dir + console_file);
-
     try {
-      file_logger.LogToConsole(false);
+      file_logger.SetConsoleLogLevel(log4cpp::Priority::WARN);
       eng = CreateBioGearsEngine(&file_logger);
     } catch (std::exception e) {
       std::cout << e.what();
@@ -168,14 +168,14 @@ void Driver::queue_Scenario(Executor exec)
 
     //NOTE:Assuming a Patient File
     sce.GetInitialParameters().SetPatientFile(ex.Patient());
-    std::cout << "Starting Scenario: " + trimed_scenario_path+"\n";
+    console_logger.Info("Starting Scenario: " + trimed_scenario_path);
     try
     {
       BioGearsScenarioExec bse{*eng};
       bse.Execute(sce, ex.Computed() + parent_dir + results_file, nullptr);
-      std::cout << "Completed Scenario: " + trimed_scenario_path +"\n";
+      console_logger.Info("Completed Scenario: " + trimed_scenario_path);
     } catch (...){
-      std::cout << "Scenario: " + trimed_scenario_path + " Failed.\n";
+      console_logger.Info("Scenario: " + trimed_scenario_path + " Failed.");
     }
   };