Resolve QPR-12433

Author: damienbarker

OREAnalytics/orea/app/oreapp.cpp

@@ -352,8 +352,9 @@ void OREApp::initFromParams() {
     inputs_->loadParameters();
     outputs_ = QuantLib::ext::make_shared<OutputParameters>(params_);
     CONSOLE("OK");
-        
+
     Settings::instance().evaluationDate() = inputs_->asof();
+    LOG("initFromParameters done, requested analytics:" << to_string(inputs_->analytics()));
 } 
 
 void OREApp::initFromInputs() {
@@ -365,7 +366,9 @@ void OREApp::initFromInputs() {
     }
 
     outputPath_ = inputs_->resultsPath().string();
-    setupLog(outputPath_, logFile_, logMask_, logRootPath_);
+    setupLog(outputPath_, logFile_, logMask_, logRootPath_, progressLogFile_, progressLogRotationSize_, progressLogToConsole_,
+             structuredLogFile_, structuredLogRotationSize_);
+    LOG("initFromInputs done, requested analytics:" << to_string(inputs_->analytics()));
 }
 
 OREApp::~OREApp() {
@@ -375,24 +378,27 @@ OREApp::~OREApp() {
 
 void OREApp::run() {
 
-    // only one thread at a time should call run
+    // Only one thread at a time should call run
     static std::mutex _s_mutex;
     std::lock_guard<std::mutex> lock(_s_mutex);
 
-    // clean up after finishing the run
-    CleanUpThreadLocalSingletons cleanupThreadLocalSingletons;
-    CleanUpThreadGlobalSingletons cleanupThreadGloablSingletons;
-    CleanUpLogSingleton cleanupLogSingleton(true, true);
+    // Clean start, but leave Singletons intact after run is completed
+    {
+      CleanUpThreadLocalSingletons cleanupThreadLocalSingletons;
+      CleanUpThreadGlobalSingletons cleanupThreadGloablSingletons;
+      CleanUpLogSingleton cleanupLogSingleton(true, true);
+    }
 
-    if (inputs_ == nullptr)
-        initFromParams();
-    else if (params_ == nullptr)
+    // Use inputs when available, otherwise try params
+    if (inputs_ != nullptr)
         initFromInputs();
+    else if (params_ != nullptr)
+        initFromParams();
     else {
         ALOG("both inputs are empty");
-        return;      
+	return;
     }
-    
+
     runTimer_.start();
 
     try {
@@ -417,22 +423,25 @@ void OREApp::run() {
 void OREApp::run(const std::vector<std::string>& marketData,
                  const std::vector<std::string>& fixingData) {
 
-    // only one thread at a time should call run
+    // Only one thread at a time should call run
     static std::mutex _s_mutex;
     std::lock_guard<std::mutex> lock(_s_mutex);
 
-    // clean up after finishing the run
-    CleanUpThreadLocalSingletons cleanupThreadLocalSingletons;
-    CleanUpThreadGlobalSingletons cleanupThreadGloablSingletons;
-    CleanUpLogSingleton cleanupLogSingleton(true, true);
+    // Clean start, but leave Singletons intact after run is completed
+    {
+      CleanUpThreadLocalSingletons cleanupThreadLocalSingletons;
+      CleanUpThreadGlobalSingletons cleanupThreadGloablSingletons;
+      CleanUpLogSingleton cleanupLogSingleton(true, true);
+    }
 
-    if (inputs_ == nullptr)
-        initFromParams();
-    else if (params_ == nullptr)
+    // Use inputs when available, otherwise try params
+    if (inputs_ != nullptr)
         initFromInputs();
+    else if (params_ != nullptr)
+        initFromParams();
     else {
         ALOG("both inputs are empty");
-        return;      
+	return;
     }
 
     runTimer_.start();