tweaks to logging

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>

Author: andrewfg

bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkRegistry.java

@@ -304,14 +304,12 @@ private void assignChannelDefaultTags(ItemChannelLink link, ActiveItem activeIte
         Set<String> channelDefaultTags = getChannelDefaultTags(link);
         if (!channelDefaultTags.isEmpty()) {
             if (alreadyHasPointOrPropertyTag) {
-                if (!useTagsGlobally) {
-                    logger.warn("Item '{}' already tagged; so did not add tags supplied by channel '{}'.",
-                            activeItem.getName(), link.getLinkedUID());
-                }
+                logger.debug("Item '{}' already tagged; ignoring tags supplied by channel '{}'.", activeItem.getName(),
+                        link.getLinkedUID());
             } else {
                 Set<String> newTags = new HashSet<>(activeItem.getTags());
                 newTags.addAll(channelDefaultTags);
-                logger.info("Item '{}' added tags '{}' supplied by channel '{}'.", activeItem.getName(),
+                logger.info("Item '{}' adding tags '{}' supplied by channel '{}'.", activeItem.getName(),
                         channelDefaultTags, link.getLinkedUID());
 
                 link.setTagsLinked(true);
@@ -342,9 +340,9 @@ private void removeChannelDefaultTags(ItemChannelLink oldLink, ActiveItem active
             // remove old link's tags
             Set<String> oldLinkTags = getChannelDefaultTags(oldLink);
             newTags.removeAll(oldLinkTags);
-            // on OH shutdown tagsLinked may be true but oldLinkTags has become empty so do not log
-            if (startlevel >= 100) {
-                logger.info("Item '{}' removed tags '{}' supplied by channel '{}'.", activeItem.getName(), oldLinkTags,
+            // on OH shutdown tagsLinked may be true but oldLinkTags is already empty so do not log
+            if (startlevel >= STARTLEVEL_COMPLETE) {
+                logger.info("Item '{}' removing tags '{}' supplied by channel '{}'.", activeItem.getName(), oldLinkTags,
                         oldLink.getLinkedUID());
             }
 
@@ -355,15 +353,13 @@ private void removeChannelDefaultTags(ItemChannelLink oldLink, ActiveItem active
                     Set<String> otherLinkTags = getChannelDefaultTags(otherLink);
                     if (!otherLinkTags.isEmpty()) {
                         if (alreadyHasPointOrPropertyTag) {
-                            if (!useTagsGlobally) {
-                                logger.warn("Item '{}' already tagged; so did not add tags supplied by channel '{}'.",
-                                        activeItem.getName(), otherLink.getLinkedUID());
-                            }
+                            logger.debug("Item '{}' already tagged; ignoring tags supplied by channel '{}'.",
+                                    activeItem.getName(), otherLink.getLinkedUID());
                             break;
                         } else {
                             alreadyHasPointOrPropertyTag = true;
                             newTags.addAll(otherLinkTags);
-                            logger.info("Item '{}' added tags '{}' supplied by channel '{}'.", activeItem.getName(),
+                            logger.info("Item '{}' adding tags '{}' supplied by channel '{}'.", activeItem.getName(),
                                     otherLinkTags, otherLink.getLinkedUID());
                             otherLink.setTagsLinked(true);
                         }