logger issues

Author: DaanHoogland

plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java

@@ -256,7 +256,7 @@ private void allow2PrimariesIfInUse(DevelopersApi api, String rscName) throws Ap
             rdm.setOverrideProps(props);
             ApiCallRcList answers = api.resourceDefinitionModify(rscName, rdm);
             if (answers.hasError()) {
-                s_logger.error("Unable to set 'allow-two-primaries' on " + rscName);
+                logger.error("Unable to set 'allow-two-primaries' on {} ", rscName);
                 // do not fail here as adding allow-two-primaries property is only a problem while live migrating
             }
         }

plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java

@@ -200,7 +200,7 @@ public static boolean isResourceInUse(DevelopersApi api, String rscName) throws
             return rscs.stream()
                     .anyMatch(rsc -> rsc.getState() != null && Boolean.TRUE.equals(rsc.getState().isInUse()));
         }
-        s_logger.error("isResourceInUse: null returned from resourceList");
+        LOGGER.error("isResourceInUse: null returned from resourceList");
         return false;
     }
 }

server/src/main/java/com/cloud/network/IpAddressManagerImpl.java

@@ -351,9 +351,7 @@ private IPAddressVO assignAndAllocateIpAddressEntry(final Account owner, final V
                 if (possibleAddr.getState() != State.Free) {
                     continue;
                 }
-                if (s_logger.isDebugEnabled()) {
-                    s_logger.debug(String.format("trying ip address %s", possibleAddr.getAddress()));
-                }
+                logger.debug("trying ip address {}", possibleAddr.getAddress());
                 possibleAddr.setSourceNat(sourceNat);
                 possibleAddr.setAllocatedTime(new Date());
                 possibleAddr.setAllocatedInDomainId(owner.getDomainId());
@@ -396,19 +394,15 @@ private IPAddressVO assignIpAddressWithLock(IPAddressVO possibleAddr) {
         IPAddressVO finalAddress = null;
         IPAddressVO userIp = _ipAddressDao.acquireInLockTable(possibleAddr.getId());
         if (userIp != null) {
-            if (s_logger.isDebugEnabled()) {
-                s_logger.debug(String.format("locked row for ip address %s (id: %s)", possibleAddr.getAddress(), possibleAddr.getUuid()));
-            }
+            logger.debug("locked row for ip address {} (id: {})", possibleAddr.getAddress(), possibleAddr.getUuid());
             if (userIp.getState() == State.Free) {
                 possibleAddr.setState(State.Allocating);
                 if (_ipAddressDao.update(possibleAddr.getId(), possibleAddr)) {
-                    s_logger.info(String.format("successfully allocated ip address %s", possibleAddr.getAddress()));
+                    logger.info("successfully allocated ip address {}", possibleAddr.getAddress());
                     finalAddress = possibleAddr;
                 }
             } else {
-                if (s_logger.isDebugEnabled()) {
-                    s_logger.debug(String.format("locked ip address %s is not free (%s)", possibleAddr.getAddress(), userIp.getState()));
-                }
+                logger.debug("locked ip address {} is not free {}", possibleAddr.getAddress(), userIp.getState());
             }
             _ipAddressDao.releaseFromLockTable(possibleAddr.getId());
         }
@@ -659,7 +653,7 @@ public boolean applyRules(List<? extends FirewallRule> rules, FirewallRule.Purpo
             if (!continueOnError) {
                 throw e;
             }
-            logger.warn("Problems with applying " + purpose + " rules but pushing on", e);
+            logger.warn("Problems with applying {} rules but pushing on", purpose, e);
             success = false;
         }
 

services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java

@@ -3107,7 +3107,7 @@ protected String parseCifsMountOptions(URI uri) {
         }
 
         String extraOptions = extraOpts.toString();
-        logger.debug("extraOpts now ", ()->StringUtils.cleanString(extraOptions));
+        logger.debug("extraOpts now {}", ()->StringUtils.cleanString(extraOptions));
 
         if (!foundUser || !foundPswd) {
             String errMsg = "Missing user and password from URI. Make sure they" + "are in the query string and separated by '&'.  E.g. "