Merge remote-tracking branch 'origin/1.0.74' into 74_into_master

# Conflicts:
#	Modules/Analytics/oreap/app/configurationbuilder.cpp
#	Modules/SIMM/orepsimm/orea/crifgenerator.cpp

Author: mgroncki

OREData/ored/utilities/log.cpp

@@ -482,6 +482,11 @@ LoggerStream::~LoggerStream() {
     }
 }
 
+void JSONMessage::log() const {
+    if (!ore::data::Log::instance().checkExcludeFilters(msg()))
+        emitLog();
+}
+
 string JSONMessage::jsonify(const boost::any& obj) {
     if (obj.type() == typeid(map<string, boost::any>)) {
         string jsonStr = "{ ";
@@ -562,7 +567,7 @@ StructuredMessage::StructuredMessage(const Category& category, const Group& grou
     }
 }
 
-void StructuredMessage::log() const {
+void StructuredMessage::emitLog() const {
     lsrc::severity_logger_mt<oreSeverity> lg;
     lg.add_attribute(messageType.get_name(), lattr::constant<string>(name));
 
@@ -608,7 +613,7 @@ void StructuredMessage::addSubFields(const map<string, string>& subFields) {
     }
 }
 
-void EventMessage::log() const {
+void EventMessage::emitLog() const {
     lsrc::severity_logger_mt<oreSeverity> lg;
     lg.add_attribute(messageType.get_name(), lattr::constant<string>(name));
     BOOST_LOG_SEV(lg, oreSeverity::alert) << json();
@@ -623,7 +628,7 @@ ProgressMessage::ProgressMessage(const string& key, const Size progressCurrent,
         boost::posix_time::to_iso_extended_string(boost::posix_time::microsec_clock::universal_time());
 }
 
-void ProgressMessage::log() const {
+void ProgressMessage::emitLog() const {
     lsrc::severity_logger_mt<oreSeverity> lg;
     lg.add_attribute(messageType.get_name(), lattr::constant<string>(name));
     BOOST_LOG_SEV(lg, oreSeverity::notice) << json();

OREData/ored/utilities/log.hpp

@@ -637,12 +637,14 @@ class JSONMessage {
     //! return a std::string for the log file
     virtual std::string msg() const = 0;
     //! generate Boost log record to pass to corresponding sinks
-    virtual void log() const = 0;
+    void log() const;
     //! create JSON-like output from the data
     const std::string json() const { return jsonify(data_); }
     void set(const std::string& key, const boost::any& value) { data_[key] = value; }
 
 protected:
+    //! generate Boost log record - this method is called by log()
+    virtual void emitLog() const = 0;
     static std::string jsonify(const boost::any&);
 
     std::map<std::string, boost::any> data_;
@@ -691,7 +693,7 @@ class StructuredMessage : public JSONMessage {
     //! return a std::string for the log file
     std::string msg() const { return std::string(name) + std::string(" ") + json(); }
     //! generate Boost log record to pass to corresponding sinks
-    void log() const;
+    void emitLog() const;
 
 protected:
     void addSubFields(const std::map<std::string, std::string>&);
@@ -720,7 +722,7 @@ class EventMessage : public JSONMessage {
     //! return a std::string for the log file
     std::string msg() const { return std::string(name) + std::string(" ") + json(); }
     //! generate Boost log record to pass to corresponding sinks
-    void log() const;
+    void emitLog() const;
 
 private:
     std::string message_;
@@ -735,7 +737,7 @@ class ProgressMessage : public JSONMessage {
     //! return a std::string for the log file
     std::string msg() const { return std::string(name) + std::string(" ") + json(); }
     //! generate Boost log record to pass to corresponding sinks
-    void log() const;
+    void emitLog() const;
 };
 
 //! Singleton to control console logging