Fixed some issues in the tests and upgraded to Boost 1.85 to address some logger issues

CMakeLists.txt

@@ -2,7 +2,7 @@
 set(AGENT_VERSION_MAJOR 2)
 set(AGENT_VERSION_MINOR 3)
 set(AGENT_VERSION_PATCH 0)
-set(AGENT_VERSION_BUILD 9)
+set(AGENT_VERSION_BUILD 10)
 set(AGENT_VERSION_RC "")
 
 # This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent

conan/mqtt_cpp/conanfile.py

@@ -10,7 +10,7 @@ class MqttcppConan(ConanFile):
     url = "https://github.com/redboltz/mqtt_cpp"
     description = "MQTT client/server for C++14 based on Boost.Asio"
     topics = ("mqtt")
-    requires = ["boost/1.82.0"]
+    requires = ["boost/1.85.0"]
     no_copy_source = True
     exports_sources = "include/*"
 

conanfile.py

@@ -35,7 +35,7 @@ class MTConnectAgentConan(ConanFile):
         "with_ruby": True,
         "development": False,
         "shared": False,
-        "winver": "0x600",
+        "winver": "0x0602",
         "with_docs": False,
         "cpack": False,
         "agent_prefix": None,
@@ -118,7 +118,7 @@ def build_requirements(self):
             self.tool_requires_version("doxygen", [1, 9, 4])
 
     def requirements(self):
-        self.requires("boost/1.82.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
+        self.requires("boost/1.85.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
         self.requires("libxml2/2.10.3", headers=True, libs=True, visible=True, transitive_headers=True, transitive_libs=True)
         self.requires("date/2.4.1", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
         self.requires("nlohmann_json/3.9.1", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
@@ -139,6 +139,9 @@ def configure(self):
         if self.options.shared:
             self.options["boost/*"].shared = True
             self.package_type = "shared-library"
+
+        if is_msvc(self):
+            self.options["boost/*"].extra_b2_flags = ("define=BOOST_USE_WINAPI_VERSION=" + str(self.options.winver))
 
         # Make sure shared builds use shared boost
         if is_msvc(self) and self.options.shared:
@@ -227,6 +230,7 @@ def package_info(self):
             winver=str(self.options.winver)
             self.cpp_info.defines.append("WINVER=" + winver)
             self.cpp_info.defines.append("_WIN32_WINNT=" + winver)
+            self.cpp_info.defines.append("BOOST_USE_WINAPI_VERSION=" + winver)
 
     def package(self):
         cmake = CMake(self)

src/mtconnect/agent.cpp

@@ -257,18 +257,18 @@ namespace mtconnect {
     for (auto source : m_sources)
       source->stop();
 
-    LOG(info) << "Shutting down sinks";
-    for (auto sink : m_sinks)
-      sink->stop();
-
-    // Signal all observers
+   // Signal all observers
     LOG(info) << "Signaling observers to close sessions";
     for (auto di : m_dataItemMap)
     {
       auto ldi = di.second.lock();
       if (ldi)
         ldi->signalObservers(0);
     }
+
+    LOG(info) << "Shutting down sinks";
+    for (auto sink : m_sinks)
+      sink->stop();
 
     LOG(info) << "Shutting down completed";
 
@@ -1469,11 +1469,19 @@ namespace mtconnect {
                    LOG(warning) << "Cannot find data item to calibrate for " << name;
                  else
                  {
-                   double fact_value = stod(factor);
-                   double off_value = stod(offset);
-
-                   device_model::data_item::UnitConversion conv(fact_value, off_value);
-                   di->setConverter(conv);
+                   try
+                   {
+                     double fact_value = stod(factor);
+                     double off_value = stod(offset);
+
+                     device_model::data_item::UnitConversion conv(fact_value, off_value);
+                     di->setConverter(conv);
+                   }
+                   catch (std::exception e)
+                   {
+                     LOG(error) << "Cannot convert factor " << factor << " or " << offset
+                                << " to double: " << e.what();
+                   }
                  }
                }
              }}};

src/mtconnect/device_model/data_item/unit_conversion.cpp

@@ -95,25 +95,33 @@ namespace mtconnect::device_model::data_item {
   {
     double power = 1.0, scale = 1.0;
 
-    if (unit.compare(0, 4, "KILO") == 0)
+    try
     {
-      scale = 1000;
-      unit.remove_prefix(4);
-    }
-    else if (unit.compare(0, 6, "CUBIC_") == 0)
-    {
-      unit.remove_prefix(6);
-      power = 3.0;
-    }
-    else if (unit.compare(0, 7, "SQUARE_") == 0)
-    {
-      unit.remove_prefix(7);
-      power = 2.0;
+      if (unit.compare(0, 4, "KILO") == 0)
+      {
+        scale = 1000;
+        unit.remove_prefix(4);
+      }
+      else if (unit.compare(0, 6, "CUBIC_") == 0)
+      {
+        unit.remove_prefix(6);
+        power = 3.0;
+      }
+      else if (unit.compare(0, 7, "SQUARE_") == 0)
+      {
+        unit.remove_prefix(7);
+        power = 2.0;
+      }
+      else if (auto p = unit.find('^'); p != string_view::npos)
+      {
+        power = stod(string(unit.substr(p + 1)));
+        unit.remove_suffix(unit.length() - p);
+      }
     }
-    else if (auto p = unit.find('^'); p != string_view::npos)
+    catch (std::exception e)
     {
-      power = stod(string(unit.substr(p + 1)));
-      unit.remove_suffix(unit.length() - p);
+      LOG(error) << "Invalid unit: " << unit << " -- " << e.what();
+      LOG(error) << "  ignoring";
     }
 
     return {scale, power};

src/mtconnect/pipeline/shdr_token_mapper.cpp

@@ -61,24 +61,6 @@ namespace mtconnect {
         return {key, nullopt};
     }
 
-    inline optional<double> getDuration(std::string &timestamp)
-    {
-      optional<double> duration;
-
-      auto pos = timestamp.find('@');
-      if (pos != string::npos)
-      {
-        auto read = pos + 1;
-        ;
-        duration = std::stod(timestamp, &read);
-        if (read == pos + 1)
-          duration.reset();
-        timestamp = timestamp.erase(pos);
-      }
-
-      return duration;
-    }
-
     // --------------------------------------
     // Mapping to data items
     static entity::Requirements s_condition {{"level", true},

src/mtconnect/pipeline/timestamp_extractor.hpp

@@ -123,7 +123,10 @@ namespace mtconnect::pipeline {
     {
       char *end {0};
       off = std::strtod(timestamp.data(), &end);
-      ;
+      if (end == timestamp.data())
+      {
+        return {n, duration};
+      }
     }
 
     if (!base)

src/mtconnect/ruby/ruby_vm.hpp

@@ -53,7 +53,7 @@ namespace mtconnect::ruby {
 
     void lock() { m_mutex.lock(); }
     void unlock() { m_mutex.unlock(); }
-    void try_lock() { m_mutex.try_lock(); }
+    [[nodiscard]] bool try_lock() { return m_mutex.try_lock(); }
 
     static auto &rubyVM() { return *m_vm; }
     static bool hasVM() { return m_vm != nullptr; }

src/mtconnect/sink/rest_sink/rest_service.cpp

@@ -523,7 +523,7 @@ namespace mtconnect {
         auto removed = *request->parameter<bool>("removed");
         auto count = *request->parameter<int32_t>("count");
         auto printer = printerForAccepts(request->m_accepts);
-        auto pretty = *request->parameter<bool>("pretty");
+        auto pretty = request->parameter<bool>("pretty").value_or(false);
 
         respond(session, assetRequest(printer, count, removed, request->parameter<string>("type"),
                                       request->parameter<string>("device"), pretty));
@@ -532,11 +532,11 @@ namespace mtconnect {
 
       auto idHandler = [&](SessionPtr session, RequestPtr request) -> bool {
         auto asset = request->parameter<string>("assetIds");
-        auto pretty = *request->parameter<bool>("pretty");
+        auto pretty = request->parameter<bool>("pretty").value_or(false);
         if (asset)
         {
           auto printer = m_sinkContract->getPrinter(acceptFormat(request->m_accepts));
-          
+
           list<string> ids;
           stringstream str(*asset);
           string id;

test_package/mqtt_sink_2_test.cpp

@@ -249,20 +249,20 @@ TEST_F(MqttSink2Test, mqtt_sink_should_publish_Sample)
   auto handler = make_unique<ClientHandler>();
   bool gotSample = false;
   bool first = true;
-  handler->m_receive = [&gotSample, &first](std::shared_ptr<MqttClient> client, const std::string &topic,
-                                    const std::string &payload) {
+  handler->m_receive = [&gotSample, &first](std::shared_ptr<MqttClient> client,
+                                            const std::string &topic, const std::string &payload) {
     if (first)
     {
       first = false;
     }
     else
     {
       EXPECT_EQ("MTConnect/Sample/000", topic);
-      
+
       auto jdoc = json::parse(payload);
       auto streams = jdoc.at("/MTConnectStreams/Streams/0/DeviceStream"_json_pointer);
       EXPECT_EQ(string("LinuxCNC"), streams.at("/name"_json_pointer).get<string>());
-      
+
       gotSample = true;
     }
   };
@@ -277,7 +277,7 @@ TEST_F(MqttSink2Test, mqtt_sink_should_publish_Sample)
 
   ASSERT_TRUE(waitFor(60s, [&first]() { return !first; }));
   ASSERT_FALSE(first);
-  
+
   m_agentTestHelper->m_adapter->processData("2021-02-01T12:00:00Z|line|204");
   ASSERT_TRUE(waitFor(10s, [&gotSample]() { return gotSample; }));
 }

test_package/mqtt_sink_test.cpp

@@ -81,6 +81,8 @@ class MqttSinkTest : public testing::Test
       m_agentTestHelper->m_ioContext.run_for(500ms);
       m_server.reset();
     }
+
+    m_service.reset();
     m_agentTestHelper.reset();
     m_jsonPrinter.reset();
   }
@@ -291,8 +293,7 @@ TEST_F(MqttSinkTest, mqtt_sink_should_publish_Streams)
 
     auto jdoc = json::parse(payload);
     string value = jdoc.at("/value"_json_pointer).get<string>();
-    EXPECT_EQ("204", value);
-    foundLineDataItem = true;
+    foundLineDataItem = value == "204";
   };
   createClient(options, std::move(handler));
   ASSERT_TRUE(startClient());