[brooklyn-ui] branch master updated: add log messages for UI modules

[heneveld]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git


The following commit(s) were added to refs/heads/master by this push:
     new b8bc9a0  add log messages for UI modules
     new 0df5bd5  Merge branch 'master' of 
https://gitbox.apache.org/repos/asf/brooklyn-ui
b8bc9a0 is described below

commit b8bc9a0412edec19ac17a40be205b9e602f18141
Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com>
AuthorDate: Tue Sep 14 14:09:14 2021 +0100

    add log messages for UI modules
    
    might help prevent or debug the error with component already registered 
(which was still happening prior to this :( )
---
 .../java/org/apache/brooklyn/ui/modularity/ExternalUiModule.java   | 4 +++-
 .../metadata/registry/impl/UiMetadataConfigListener.java           | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git 
a/modularity-server/external-modules/src/main/java/org/apache/brooklyn/ui/modularity/ExternalUiModule.java
 
b/modularity-server/external-modules/src/main/java/org/apache/brooklyn/ui/modularity/ExternalUiModule.java
index 49664cf..e835b24 100644
--- 
a/modularity-server/external-modules/src/main/java/org/apache/brooklyn/ui/modularity/ExternalUiModule.java
+++ 
b/modularity-server/external-modules/src/main/java/org/apache/brooklyn/ui/modularity/ExternalUiModule.java
@@ -48,7 +48,7 @@ public class ExternalUiModule implements UiModule {
 
     static final String PID = "org.apache.brooklyn.ui.external.module";
 
-    private static final Logger LOG = 
LoggerFactory.getLogger(ExternalUiModule.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PID);
     private static final Dictionary<String, ?> EMPTY_DICTIONARY = new 
Hashtable<>();
 
     private final String MODULE_TYPE = "external-ui-module";
@@ -71,6 +71,7 @@ public class ExternalUiModule implements UiModule {
 
     @Activate
     public void activate(final Map<String, String> properties) {
+        LOG.debug("Activating module "+this+": "+properties);
         if (!properties.containsKey(KEY_URL) && 
properties.containsKey("component.id")) {
             // activation properties aren't usually for a module; do this 
check to suppress warning
             LOG.debug("Not setting module properties for activation properties 
"+properties);
@@ -81,6 +82,7 @@ public class ExternalUiModule implements UiModule {
 
     @Modified
     public void modified(final Map<String, String> properties) {
+        LOG.debug("Modified module "+this+": "+properties);
         this.setModuleProperties(properties);
     }
 
diff --git 
a/modularity-server/metadata-registry/src/main/java/org/apache/brooklyn/ui/modularity/metadata/registry/impl/UiMetadataConfigListener.java
 
b/modularity-server/metadata-registry/src/main/java/org/apache/brooklyn/ui/modularity/metadata/registry/impl/UiMetadataConfigListener.java
index 6d589a9..5e52620 100644
--- 
a/modularity-server/metadata-registry/src/main/java/org/apache/brooklyn/ui/modularity/metadata/registry/impl/UiMetadataConfigListener.java
+++ 
b/modularity-server/metadata-registry/src/main/java/org/apache/brooklyn/ui/modularity/metadata/registry/impl/UiMetadataConfigListener.java
@@ -32,13 +32,13 @@ import static com.google.common.base.Predicates.in;
 import static com.google.common.base.Predicates.not;
 
 @Component(
-        //name = "Brooklyn UI Metadata", // omitting the name / using default 
seems to prevent warning about it being unable to be installed?
+        //name = "Brooklyn UI Metadata", // name as class is common and the 
default
         configurationPid = UiMetadataConfigListener.PID, configurationPolicy = 
ConfigurationPolicy.OPTIONAL, immediate = true,
         property = {UiMetadataRegistry.METADATA_TYPE + ":String=" + 
UiMetadataRegistry.METADATA_TYPE_DEFAULT}
 )
 public class UiMetadataConfigListener {
     static final String PID = "org.apache.brooklyn.ui.modularity.metadata";
-    private static final Logger logger = 
LoggerFactory.getLogger(UiMetadataConfigListener.class);
+    private static final Logger logger = LoggerFactory.getLogger(PID);
     private static final List<String> EXCLUDE = Arrays.asList(
             "felix.fileinstall.filename", "service.factoryPid", 
"component.name", "component.id"
     );
@@ -53,6 +53,7 @@ public class UiMetadataConfigListener {
 
     @Activate
     public void activate(final Map<String, String> properties) {
+        logger.debug("Activate "+this+": "+properties);
         if (getId(properties)==null) {
             logger.debug("Skipping recording of metadata config for irrelevant 
activation record: "+properties);
         } else {
@@ -62,6 +63,7 @@ public class UiMetadataConfigListener {
 
     @Modified
     public void modified(final Map<String, String> properties) {
+        logger.debug("Modified "+this+": "+properties);
         String id = getId(properties);
         if (id==null) {
             logger.warn("Skipping update of UI metadata because ID is not 
specified: "+properties);
@@ -77,6 +79,7 @@ public class UiMetadataConfigListener {
     
     @Deactivate
     public void deactivate(final Map<String, String> properties) {
+        logger.debug("Deactivate "+this+": "+properties);
         String id = getId(properties);
         if (id==null) {
             logger.debug("Skipping deactivation of UI metadata because ID is 
not specified: "+properties);