Merge pull request #607 from mtconnect/swagger_and_logging_fix

Swagger and logging fix

Author: wsobel

CMakeLists.txt

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

conan/profiles/gcc

@@ -3,6 +3,3 @@ include(default)
 [settings]
 compiler.libcxx=libstdc++11
 compiler.cppstd=20
-
-[system_tools]
-cmake/>3.23.0

demo/compose/agent/agent.cfg

@@ -1,9 +1,7 @@
 Devices = Devices.xml
 SchemaVersion = 2.7
 WorkerThreads = 3
-MonitorConfigFiles = yes
 Port = 5000
-JsonVersion = 1
 
 MinCompressFileSize = 10k
 

demo/compose/agent/agentmqtt.cfg

@@ -1,9 +1,8 @@
 Devices = Devices.xml
 SchemaVersion = 2.7
 WorkerThreads = 3
-MonitorConfigFiles = yes
 Port = 5000
-JsonVersion = 1
+JsonVersion = 2
 
 MinCompressFileSize = 10k
 

demo/styles/styles.xsl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2005/xpath-functions"
-  xmlns:m="urn:mtconnect.org:MTConnectDevices:2.0" xmlns:s="urn:mtconnect.org:MTConnectStreams:2.0" xmlns:e="urn:mtconnect.org:MTConnectError:2.0" xmlns:js="urn:custom-javascript"
+  xmlns:m="urn:mtconnect.org:MTConnectDevices:2.7" xmlns:s="urn:mtconnect.org:MTConnectStreams:2.7" xmlns:e="urn:mtconnect.org:MTConnectError:2.7" xmlns:js="urn:custom-javascript"
   exclude-result-prefixes="msxsl js" xmlns:msxsl="urn:schemas-microsoft-com:xslt">
 
   <xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes"/>

src/mtconnect/configuration/agent_config.cpp

@@ -529,7 +529,8 @@ namespace mtconnect::configuration {
 
     ConfigOptions options;
     AddDefaultedOptions(logger, options,
-                        {{"max_size", "2mb"s},
+                        {{"max_size", ""s},
+                         {"rotation_size", ""s},  // for backward compatibility
                          {"max_archive_size", "10mb"s},
                          {"max_index", 9},
                          {"file_name", defaultFileName},
@@ -602,8 +603,11 @@ namespace mtconnect::configuration {
     auto &archiveLogDirectory = logChannel.m_archiveLogDirectory;
     auto &logFileName = logChannel.m_logFileName;
 
+    logRotationSize = 2 * 1024 * 1024;  // Default to 2MB for log rotation size
     maxLogArchiveSize = ConvertFileSize(options, "max_archive_size", maxLogArchiveSize);
+    logRotationSize = ConvertFileSize(options, "rotation_size", logRotationSize);
     logRotationSize = ConvertFileSize(options, "max_size", logRotationSize);
+
     int max_index = *GetOption<int>(options, "max_index");
 
     if (auto sched = GetOption<string>(options, "schedule"))

src/mtconnect/entity/json_parser.cpp

@@ -177,8 +177,7 @@ namespace mtconnect {
       return nullptr;
     }
 
-    EntityPtr JsonParser::parse(FactoryPtr factory, const string& document, const string& version,
-                                ErrorList& errors)
+    EntityPtr JsonParser::parse(FactoryPtr factory, const string& document, ErrorList& errors)
     {
       NAMED_SCOPE("entity.json_parser");
       EntityPtr entity;

src/mtconnect/entity/json_parser.hpp

@@ -46,8 +46,7 @@ namespace mtconnect {
       /// @param version the version to parse
       /// @param errors Errors that occurred creating the entities
       /// @return an entity shared pointer if successful
-      EntityPtr parse(FactoryPtr factory, const std::string &document, const std::string &version,
-                      ErrorList &errors);
+      EntityPtr parse(FactoryPtr factory, const std::string &document, ErrorList &errors);
 
     protected:
       uint32_t m_version;

src/mtconnect/observation/change_observer.hpp

@@ -306,13 +306,13 @@ namespace mtconnect::observation {
     AsyncObserver(boost::asio::io_context::strand &strand,
                   mtconnect::buffer::CircularBuffer &buffer, FilterSet &&filter,
                   std::chrono::milliseconds interval, std::chrono::milliseconds heartbeat)
-    : AsyncResponse(interval),
-    m_heartbeat(heartbeat),
-    m_last(std::chrono::system_clock::now()),
-    m_filter(std::move(filter)),
-    m_strand(strand),
-    m_observer(strand),
-    m_buffer(buffer)
+      : AsyncResponse(interval),
+        m_heartbeat(heartbeat),
+        m_last(std::chrono::system_clock::now()),
+        m_filter(std::move(filter)),
+        m_strand(strand),
+        m_observer(strand),
+        m_buffer(buffer)
     {}
 
     /// @brief default destructor
@@ -335,7 +335,7 @@ namespace mtconnect::observation {
     void handlerCompleted()
     {
       NAMED_SCOPE("AsyncObserver::handlerCompleted");
-      
+
       m_last = std::chrono::system_clock::now();
       if (m_endOfBuffer)
       {

src/mtconnect/parser/json_parser.cpp

@@ -179,7 +179,7 @@ namespace mtconnect::parser {
     {
       entity::ErrorList errors;
       entity::JsonParser parser(version);
-      auto entity = parser.parse(Device::getRoot(), jsonDoc, "2.3", errors);
+      auto entity = parser.parse(Device::getRoot(), jsonDoc, errors);
 
       if (!errors.empty())
       {