Merge pull request #421 from mnoomnoo/issue-420

Fix for issue 420
mtconnect · Mar 9, 2024 · 422e9e1 · 422e9e1
2 parents 4811825 + 927c8a6
commit 422e9e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/mtconnect/configuration/agent_config.cpp b/src/mtconnect/configuration/agent_config.cpp
@@ -315,7 +315,7 @@ namespace mtconnect::configuration {
       LOG(warning) << "... File changed at: " << put_time(localtime(&t), "%F %T");
     }
 
-    auto delta = min(now - cfgTime, now - devTime);
+    auto delta = duration_cast<seconds>(min(now - cfgTime, now - devTime));
     if (delta < m_monitorDelay)
     {
       LOG(warning) << "... Waiting " << int32_t((m_monitorDelay - delta).count()) << " seconds";

diff --git a/test_package/agent_test.cpp b/test_package/agent_test.cpp
@@ -2680,7 +2680,8 @@ TEST_F(AgentTest, should_stream_data_with_interval)
     ASSERT_FALSE(m_agentTestHelper->m_session->m_chunkBody.empty());
     PARSE_XML_CHUNK();
 
-    EXPECT_GT(slop, delta) << "delta " << delta.count() << " < delay " << slop.count();
+    auto deltaMS = duration_cast<milliseconds>(delta);
+    EXPECT_GT(slop, deltaMS) << "delta " << deltaMS.count() << " < delay " << slop.count();
   }
 }