From dbadbb4e6dc3782c69bc68fce8c9df22381ba242 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 10 Jun 2021 16:03:10 +0100
Subject: [PATCH] Log INFO metadata on entities

See ukf/ukf-meta#63.
---
 build.xml             |  3 ++-
 mdx/common-beans.xml  | 15 +++++++++++++++
 mdx/uk/generate.xml   |  6 ++++++
 tools/mda-logging.xml | 22 ++++++++++++++++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 tools/mda-logging.xml

diff --git a/build.xml b/build.xml
index 44b6d4a..71282e7 100644
--- a/build.xml
+++ b/build.xml
@@ -1689,7 +1689,8 @@
                     <propertyset refid="mda.properties"/>
                 </syspropertyset>
                 <jvmarg value="-enableassertions"/>
-                <arg value="--quiet"/>
+                <arg value="--logConfig"/>
+                <arg value="${tools.dir}/mda-logging.xml"/>
                 <arg value="@{config}"/>
                 <arg value="@{pipeline}"/>
             </java>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 645e668..8591646 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -590,6 +590,21 @@
         </property>
     </bean>
 
+    <!--
+        infoAnnouncer
+
+        A pipeline stage that logs any info metadata present,
+        but takes no action on them.
+    -->
+    <bean id="infoAnnouncer" parent="mda.StatusMetadataLoggingStage">
+        <property name="identificationStrategy" ref="identificationStrategy"/>
+        <property name="selectionRequirements">
+            <list>
+                <value>#{T(net.shibboleth.metadata.InfoStatus)}</value>
+            </list>
+        </property>
+    </bean>
+
     <!--
         warningAnnouncer
 
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 478b42f..4b8fe25 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -1130,6 +1130,12 @@
                     p:registrationAuthorityDisplayNames-ref="registrationAuthorityDisplayNameMap"
                 />
 
+                <!--
+                    Output any INFO metadata we may have accumulated, such
+                    as from discovery name deconfliction.
+                -->
+                <ref bean="infoAnnouncer"/>
+
                 <!--
                     *********************************************************
                     ***                                                   ***
diff --git a/tools/mda-logging.xml b/tools/mda-logging.xml
new file mode 100644
index 0000000..e54756d
--- /dev/null
+++ b/tools/mda-logging.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <charset>UTF-8</charset>
+            <Pattern>%-5level - %msg%n</Pattern>
+        </encoder>
+    </appender>
+    
+    <!--
+        Based on the default quiet logging configuration, adding anything we
+        specifically want to see from lower levels than WARN.
+    -->
+
+    <logger name="net.shibboleth.metadata.pipeline.StatusMetadataLoggingStage" level="INFO"/>
+
+    <root level="WARN">
+        <appender-ref ref="CONSOLE"/>
+    </root>
+    
+</configuration>