Merge pull request #395 from jwillemsen/jwi-silentnddslogging

Redirect some RTI Connext DDS logging to a log file
RemedyIT · May 16, 2023 · da0379d · da0379d
2 parents cfd865a + d53f8e9
commit da0379d
Show file tree

Hide file tree

Showing 11 changed files with 94 additions and 5 deletions.
diff --git a/...ors/dds4ccm/tests/filters/filter_attrib/listeners/event/descriptors/USER_QOS_PROFILES.xml b/...ors/dds4ccm/tests/filters/filter_attrib/listeners/event/descriptors/USER_QOS_PROFILES.xml
@@ -7,6 +7,17 @@
 -->
 <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="rti_dds_qos_profiles.xsd" version="5.2.3">
   <qos_library name="defaultlibrary">
+    <qos_profile name="SilentLogging" is_default_participant_factory_profile="true">
+      <!--
+      This test triggers RTI Connext DDS errors because it tests possible error situations, redirect the default logging
+      to nddslogging.log.
+      -->
+      <participant_factory_qos>
+      <logging>
+        <output_file>nddslogging.log</output_file>
+      </logging>
+      </participant_factory_qos>
+    </qos_profile>
     <qos_profile name="defaultprofile" is_default_qos="false">
       <participant_qos>
         <transport_builtin>

diff --git a/...ors/dds4ccm/tests/filters/filter_attrib/listeners/state/descriptors/USER_QOS_PROFILES.xml b/...ors/dds4ccm/tests/filters/filter_attrib/listeners/state/descriptors/USER_QOS_PROFILES.xml
@@ -7,6 +7,17 @@
 -->
 <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="rti_dds_qos_profiles.xsd" version="5.2.3">
   <qos_library name="defaultlibrary">
+    <qos_profile name="SilentLogging" is_default_participant_factory_profile="true">
+      <!--
+      This test triggers RTI Connext DDS errors because it tests possible error situations, redirect the default logging
+      to nddslogging.log.
+      -->
+      <participant_factory_qos>
+      <logging>
+        <output_file>nddslogging.log</output_file>
+      </logging>
+      </participant_factory_qos>
+    </qos_profile>
     <qos_profile name="defaultprofile" is_default_qos="false">
       <participant_qos>
         <transport_builtin>

diff --git a/connectors/dds4ccm/tests/filters/filter_attrib/read_get/descriptors/USER_QOS_PROFILES.xml b/connectors/dds4ccm/tests/filters/filter_attrib/read_get/descriptors/USER_QOS_PROFILES.xml
@@ -7,6 +7,17 @@
 -->
 <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="rti_dds_qos_profiles.xsd" version="5.2.3">
   <qos_library name="defaultlibrary">
+    <qos_profile name="SilentLogging" is_default_participant_factory_profile="true">
+      <!--
+      This test triggers RTI Connext DDS errors because it tests possible error situations, redirect the default logging
+      to nddslogging.log.
+      -->
+      <participant_factory_qos>
+      <logging>
+        <output_file>nddslogging.log</output_file>
+      </logging>
+      </participant_factory_qos>
+    </qos_profile>
     <qos_profile name="defaultprofile" is_default_qos="false">
       <participant_qos>
         <transport_builtin>

diff --git a/connectors/dds4ccm/tests/filters/query_attrib/read_get/descriptors/USER_QOS_PROFILES.xml b/connectors/dds4ccm/tests/filters/query_attrib/read_get/descriptors/USER_QOS_PROFILES.xml
@@ -7,6 +7,17 @@
 -->
 <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="rti_dds_qos_profiles.xsd" version="5.2.3">
   <qos_library name="defaultlibrary">
+    <qos_profile name="SilentLogging" is_default_participant_factory_profile="true">
+      <!--
+      This test triggers RTI Connext DDS errors because it tests possible error situations, redirect the default logging
+      to nddslogging.log.
+      -->
+      <participant_factory_qos>
+      <logging>
+        <output_file>nddslogging.log</output_file>
+      </logging>
+      </participant_factory_qos>
+    </qos_profile>
     <qos_profile name="defaultprofile" is_default_qos="false">
       <participant_qos>
         <transport_builtin>

diff --git a/connectors/dds4ccm/tests/port_status_listener/sample_lost/descriptors/USER_QOS_PROFILES.xml b/connectors/dds4ccm/tests/port_status_listener/sample_lost/descriptors/USER_QOS_PROFILES.xml
@@ -7,6 +7,17 @@
 -->
 <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="rti_dds_qos_profiles.xsd" version="5.2.3">
   <qos_library name="samplelostlibrary">
+    <qos_profile name="SilentLogging" is_default_participant_factory_profile="true">
+      <!--
+      This test triggers RTI Connext DDS errors because it tests possible error situations, redirect the default logging
+      to nddslogging.log.
+      -->
+      <participant_factory_qos>
+      <logging>
+        <output_file>nddslogging.log</output_file>
+      </logging>
+      </participant_factory_qos>
+    </qos_profile>
     <qos_profile name="SampleLostProfile" is_default_qos="false">
       <!-- QoS used to configure the data writer created in the example code -->
       <participant_qos>

diff --git a/connectors/dds4ccm/tests/unkeyed_writer/descriptors/USER_QOS_PROFILES.xml b/connectors/dds4ccm/tests/unkeyed_writer/descriptors/USER_QOS_PROFILES.xml
@@ -7,6 +7,17 @@
 -->
 <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="rti_dds_qos_profiles.xsd" version="5.2.3">
   <qos_library name="unkeyedwriterlibrary">
+    <qos_profile name="SilentLogging" is_default_participant_factory_profile="true">
+      <!--
+      This test triggers RTI Connext DDS errors because it tests possible error situations, redirect the default logging
+      to nddslogging.log.
+      -->
+      <participant_factory_qos>
+      <logging>
+        <output_file>nddslogging.log</output_file>
+      </logging>
+      </participant_factory_qos>
+    </qos_profile>
     <qos_profile name="UnkeyedWriterProfile" is_default_qos="false">
       <participant_qos>
         <transport_builtin>

diff --git a/ddsx11/tests/builtin/descriptors/USER_QOS_PROFILES.xml b/ddsx11/tests/builtin/descriptors/USER_QOS_PROFILES.xml
@@ -7,6 +7,17 @@
 -->
 <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="rti_dds_qos_profiles.xsd" version="5.2.3">
   <qos_library name="shapes">
+    <qos_profile name="SilentLogging" is_default_participant_factory_profile="true">
+      <!--
+      This test triggers RTI Connext DDS errors because it tests possible error situations, redirect the default logging
+      to nddslogging.log.
+      -->
+      <participant_factory_qos>
+      <logging>
+        <output_file>nddslogging.log</output_file>
+      </logging>
+      </participant_factory_qos>
+    </qos_profile>
     <qos_profile name="ShapesProfile" is_default_qos="false">
       <participant_qos>
         <transport_builtin>

diff --git a/exf/brix/exf/apc/ports/port_type.rb b/exf/brix/exf/apc/ports/port_type.rb
@@ -8,6 +8,6 @@
 #--------------------------------------------------------------------
 
 # load all interaction pattern port type implementations
-Dir.glob(File.join(File.dirname(__FILE__), 'port_types', '*.rb')).each do |fnm|
+Dir.glob(File.join(File.dirname(__FILE__), 'port_types', '*.rb')).sort.each do |fnm|
   require fnm
 end
diff --git a/exf/brix/exf/apc/ports/port_types/corba4ccm_port.rb b/exf/brix/exf/apc/ports/port_types/corba4ccm_port.rb
@@ -52,15 +52,16 @@ module DataInteractionHandler
         def self.setup_data(recipe, fidl)
           # does the IDL file need full skeletons?
           if fidl.properties[:needs_skel]
-            if mpc_idl_obj = recipe.mpc_file[:skel_gen]
+            mpc_idl_obj = recipe.mpc_file[:skel_gen]
+            if mpc_idl_obj
               # check if ExF support flag needs to be added
               mpc_idl_obj.base_projects << 'ciaox11_exf_idl' if fidl.properties[:exf_skel]
               # now update the skel compiler project
               mpc_skel_obj = recipe.mpc_file[:skel]
               # do we need ExF base project?
               mpc_skel_obj.base_projects << 'ciaox11_exf_amh' if fidl.properties[:exf_skel]
               # could be that we add this multiple times but that is no problem as
-              # #base_projects is a unique string list
+              # base_projects is a unique string list
             end
           end
         end

diff --git a/exf/brix/exf/apc/require.rb b/exf/brix/exf/apc/require.rb
@@ -8,11 +8,11 @@
 #--------------------------------------------------------------------
 
 # load all recipe specializations
-Dir.glob(File.join(File.dirname(__FILE__), 'recipes', '*.rb')).each do |fnm|
+Dir.glob(File.join(File.dirname(__FILE__), 'recipes', '*.rb')).sort.each do |fnm|
   require fnm
 end
 
 # load all port implementations
-Dir.glob(File.join(File.dirname(__FILE__), 'ports', '*.rb')).each do |fnm|
+Dir.glob(File.join(File.dirname(__FILE__), 'ports', '*.rb')).sort.each do |fnm|
   require fnm
 end
diff --git a/exf/connectors/dds4ccm/tests/exf/unkeyed_writer/descriptors/USER_QOS_PROFILES.xml b/exf/connectors/dds4ccm/tests/exf/unkeyed_writer/descriptors/USER_QOS_PROFILES.xml
@@ -7,6 +7,17 @@
 -->
 <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="rti_dds_qos_profiles.xsd" version="5.2.3">
   <qos_library name="unkeyedwriterlibrary">
+    <qos_profile name="SilentLogging" is_default_participant_factory_profile="true">
+      <!--
+      This test triggers RTI Connext DDS errors because it tests possible error situations, redirect the default logging
+      to nddslogging.log.
+      -->
+      <participant_factory_qos>
+      <logging>
+        <output_file>nddslogging.log</output_file>
+      </logging>
+      </participant_factory_qos>
+    </qos_profile>
     <qos_profile name="UnkeyedWriterProfile" is_default_qos="false">
       <participant_qos>
         <transport_builtin>