git subrepo pull (merge) ore

subrepo:
  subdir:   "ore"
  merged:   "8b864d2808"
upstream:
  origin:   "git@gitlab.acadiasoft.net:qs/ore.git"
  branch:   "master"
  commit:   "d2c3ccb079"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

Author: jenkins

OREAnalytics/orea/app/oreapp.cpp

@@ -156,10 +156,7 @@ boost::shared_ptr<AggregationScenarioData> OREApp::getMarketCube(std::string cub
 }
 
 std::vector<std::string> OREApp::getErrors() {
-    std::vector<std::string> errors;
-    while (fbLogger_ && fbLogger_->logger->hasNext())
-        errors.push_back(fbLogger_->logger->next());
-    return errors;
+    return structuredLogger_->messages();
 }
 
 Real OREApp::getRunTime() {
@@ -383,6 +380,7 @@ void OREApp::run() {
     runTimer_.start();
 
     try {
+        structuredLogger_->clear();
         analytics();
     } catch (std::exception& e) {
         StructuredAnalyticsWarningMessage("OREApp::run()", "Error", e.what()).log();
@@ -403,6 +401,7 @@ void OREApp::run(const std::vector<std::string>& marketData,
 
     try {
         LOG("ORE analytics starting");
+        structuredLogger_->clear();
         MEM_LOG_USING_LEVEL(ORE_WARNING)
 
         QL_REQUIRE(inputs_, "ORE input parameters not set");
@@ -1411,8 +1410,6 @@ void OREApp::setupLog(const std::string& path, const std::string& file, Size mas
     QL_REQUIRE(boost::filesystem::is_directory(p), "output path '" << path << "' is not a directory.");
 
     Log::instance().registerLogger(boost::make_shared<FileLogger>(file));
-    // Report StructuredErrorMessages with level WARNING, ERROR, CRITICAL, ALERT
-    fbLogger_ = boost::make_shared<FilteredBufferedLoggerGuard>();
     boost::filesystem::path oreRootPath =
         logRootPath.empty() ? boost::filesystem::path(__FILE__).parent_path().parent_path().parent_path().parent_path()
                             : logRootPath;
@@ -1428,10 +1425,10 @@ void OREApp::setupLog(const std::string& path, const std::string& file, Size mas
     Log::instance().registerIndependentLogger(progressLogger);
 
     // Structured message logger
-    auto structuredLogger = boost::make_shared<StructuredLogger>();
+    structuredLogger_ = boost::make_shared<StructuredLogger>();
     string structuredLogFilePath = structuredLogFile.empty() ? path + "/log_structured.json" : structuredLogFile;
-    structuredLogger->setFileLog(structuredLogFilePath, path, structuredLogRotationSize);
-    Log::instance().registerIndependentLogger(structuredLogger);
+    structuredLogger_->setFileLog(structuredLogFilePath, path, structuredLogRotationSize);
+    Log::instance().registerIndependentLogger(structuredLogger_);
 
     // Event message logger
     auto eventLogger = boost::make_shared<EventLogger>();

OREAnalytics/orea/app/oreapp.hpp

@@ -27,8 +27,6 @@
 #include <orea/app/parameters.hpp>
 #include <orea/app/analyticsmanager.hpp>
 
-#include <ored/utilities/filteredbufferedlogger.hpp>
-
 #include <boost/make_shared.hpp>
 #include <boost/timer/timer.hpp>
 
@@ -102,7 +100,7 @@ class OREApp {
     boost::shared_ptr<OutputParameters> outputs_;
 
     boost::shared_ptr<AnalyticsManager> analyticsManager_;
-    boost::shared_ptr<FilteredBufferedLoggerGuard> fbLogger_;
+    boost::shared_ptr<StructuredLogger> structuredLogger_;
     boost::timer::cpu_timer runTimer_;
 };
 

OREData/ored/CMakeLists.txt

@@ -337,7 +337,6 @@ utilities/currencyhedgedequityindexdecomposition.cpp
 utilities/currencyparser.cpp
 utilities/dategrid.cpp
 utilities/fileio.cpp
-utilities/filteredbufferedlogger.cpp
 utilities/flowanalysis.cpp
 utilities/indexnametranslator.cpp
 utilities/indexparser.cpp
@@ -721,7 +720,6 @@ utilities/currencyhedgedequityindexdecomposition.hpp
 utilities/currencyparser.hpp
 utilities/dategrid.hpp
 utilities/fileio.hpp
-utilities/filteredbufferedlogger.hpp
 utilities/flowanalysis.hpp
 utilities/indexnametranslator.hpp
 utilities/indexparser.hpp

OREData/ored/ored.hpp

@@ -369,7 +369,6 @@
 #include <ored/utilities/currencyparser.hpp>
 #include <ored/utilities/dategrid.hpp>
 #include <ored/utilities/fileio.hpp>
-#include <ored/utilities/filteredbufferedlogger.hpp>
 #include <ored/utilities/flowanalysis.hpp>
 #include <ored/utilities/indexnametranslator.hpp>
 #include <ored/utilities/indexparser.hpp>

OREData/ored/utilities/filteredbufferedlogger.cpp

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <ql/patterns/singleton.hpp>
-
+#include <boost/thread/shared_mutex.hpp>
 #include <cstdint>
 #include <set>
 

OREData/ored/utilities/filteredbufferedlogger.hpp

@@ -30,6 +30,7 @@
 #include <boost/accumulators/statistics/variance.hpp>
 
 #include <iostream>
+#include <map>
 
 // if defined, RandomVariableStats are updated (this might impact perfomance!), default is undefined
 //#define ENABLE_RANDOMVARIABLE_STATS