etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix logger

This commit is contained in:
Pearl Dsilva 2024-02-08 11:49:51 -05:00
parent eb916bfb32
commit 27599d85fc
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -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;
}

10
server/src/main/java/com/cloud/network/NetworkServiceImpl.java
View File

@ -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<IPAddressVO> 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;

4
server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java
View File

@ -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);
}
}

2
server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java
View File

@ -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;
}

4
server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java
View File

@ -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);
}
}

2
server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
View File

@ -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);
}
}