From 27599d85fc7aed7541e94783b85cfe90a161f264 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Thu, 8 Feb 2024 11:49:51 -0500 Subject: [PATCH] fix logger --- .../cloud/configuration/ConfigurationManagerImpl.java | 4 ++-- .../java/com/cloud/network/NetworkServiceImpl.java | 10 +++++----- .../cloud/network/firewall/FirewallManagerImpl.java | 4 ++-- .../com/cloud/network/vpc/NetworkACLManagerImpl.java | 2 +- .../com/cloud/network/vpc/NetworkACLServiceImpl.java | 4 ++-- .../java/com/cloud/server/ConfigurationServerImpl.java | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index 8564c1b36f9..36c077415ab 100644 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java @@ -6001,8 +6001,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } } else { if (Objects.nonNull(nsxMode)) { - if (s_logger.isTraceEnabled()) { - s_logger.trace("nsxMode has is ignored for non-NSX enabled zones"); + if (logger.isTraceEnabled()) { + logger.trace("nsxMode has is ignored for non-NSX enabled zones"); } nsxMode = null; } diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java index 629a6aa312f..1184ff14094 100644 --- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java @@ -834,7 +834,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C for (InternalLoadBalancerElementService service : internalLoadBalancerElementServices) { internalLoadBalancerElementServiceMap.put(service.getProviderType().name(), service); } - s_logger.debug(String.format("Discovered internal loadbalancer elements configured on NetworkServiceImpl")); + logger.debug(String.format("Discovered internal loadbalancer elements configured on NetworkServiceImpl")); } } @@ -1170,14 +1170,14 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C VlanVO vlan = findOneVlanRangeMatchingVlanDetailKey(zone, vlanDetailKey); if (vlan == null) { String msg = String.format("Cannot find any vlan matching the detail key %s on zone %s", vlanDetailKey, zone.getName()); - s_logger.error(msg); + logger.error(msg); throw new CloudRuntimeException(msg); } List freeIps = _ipAddressDao.listByVlanIdAndState(vlan.getId(), State.Free); if (CollectionUtils.isEmpty(freeIps)) { String msg = String.format("Cannot find any free IP matching on the VLAN range %s on zone %s", vlan.getIpRange(), zone.getName()); - s_logger.error(msg); + logger.error(msg); throw new CloudRuntimeException(msg); } @@ -1206,7 +1206,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C for (VlanVO zoneVlan : zoneVlans) { VlanDetailsVO detail = vlanDetailsDao.findDetail(zoneVlan.getId(), vlanDetailKey); if (detail != null && detail.getValue().equalsIgnoreCase("true")) { - s_logger.debug(String.format("Found the VLAN range %s is set for NSX on zone %s", zoneVlan.getIpRange(), zone.getName())); + logger.debug(String.format("Found the VLAN range %s is set for NSX on zone %s", zoneVlan.getIpRange(), zone.getName())); return zoneVlan; } } @@ -6112,7 +6112,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C PhysicalNetworkServiceProviderVO provider = _pNSPDao.findById(networkProviderId); if (provider == null) { String msg = String.format("Cannot find a network service provider with ID %s", networkProviderId); - s_logger.error(msg); + logger.error(msg); throw new CloudRuntimeException(msg); } Type type = provider.getProviderName().equalsIgnoreCase("nsx") ? Type.Nsx : Type.InternalLbVm; diff --git a/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java index 9b002186e91..e9a93528d05 100644 --- a/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java +++ b/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java @@ -733,7 +733,7 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, if (NetUtils.ICMP_PROTO.equals(protocol.toLowerCase(Locale.ROOT)) && (rule.getIcmpType() == -1 || rule.getIcmpCode() == -1) && State.Add.equals(rule.getState())) { String errorMsg = "Passing -1 for ICMP type is not supported for NSX enabled zones"; - s_logger.error(errorMsg); + logger.error(errorMsg); throw new InvalidParameterValueException(errorMsg); } @@ -741,7 +741,7 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, (Objects.isNull(rule.getSourcePortStart()) || Objects.isNull(rule.getSourcePortEnd())) && State.Add.equals(rule.getState())) { String errorMsg = "Source start and end ports are required to be passed"; - s_logger.error(errorMsg); + logger.error(errorMsg); throw new InvalidParameterValueException(errorMsg); } } diff --git a/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java index d380b33dd52..2f37bdda75a 100644 --- a/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java @@ -377,7 +377,7 @@ public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLMana return provider.reorderAclRules(vpc, networks, networkACLItems); } } catch (final Exception ex) { - s_logger.debug("Failed to reorder ACLs on NSX due to: " + ex.getLocalizedMessage()); + logger.debug("Failed to reorder ACLs on NSX due to: " + ex.getLocalizedMessage()); } return false; } diff --git a/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java index 9ff6cf47acc..4a87f4b5b18 100644 --- a/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -448,14 +448,14 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ if (NetUtils.ICMP_PROTO.equals(protocol.toLowerCase(Locale.ROOT)) && (icmpType == -1 || icmpCode == -1)) { String errorMsg = "Passing -1 for ICMP type is not supported for NSX enabled zones"; - s_logger.error(errorMsg); + logger.error(errorMsg); throw new InvalidParameterValueException(errorMsg); } if (List.of(NetUtils.TCP_PROTO, NetUtils.UDP_PROTO).contains(protocol.toLowerCase(Locale.ROOT)) && (Objects.isNull(sourcePortStart) || Objects.isNull(sourcePortEnd))) { String errorMsg = "Source start and end ports are required to be passed"; - s_logger.error(errorMsg); + logger.error(errorMsg); throw new InvalidParameterValueException(errorMsg); } } diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java index e1b29171fcf..821f93a5ba0 100644 --- a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java @@ -1240,7 +1240,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultNatNSXNetworkOffering.getId(), service.getKey(), service.getValue()); _ntwkOfferingServiceMapDao.persist(offService); - s_logger.trace("Added service for the network offering: " + offService); + logger.trace("Added service for the network offering: " + offService); } }