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

merge conflicts (in loggers)

This commit is contained in:
João Jandre 2024-09-19 15:12:44 -03:00
parent 41e7a2a689
commit 477beaffbf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1569,7 +1569,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
}
return _ipAddressDao.findById(ipId);
} catch (Exception e) {
s_logger.error(String.format("Failed to associate ip address %s to network %s", ipToAssoc, network), e);
logger.error(String.format("Failed to associate ip address %s to network %s", ipToAssoc, network), e);
throw new CloudRuntimeException(String.format("Failed to associate ip address %s to network %s", ipToAssoc, network), e);
} finally {
if (!success && releaseOnFailure) {

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

@ -3195,7 +3195,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
}
});
} catch (Exception e) {
s_logger.error("Failed to associate ip " + ipToAssoc + " to vpc " + vpc, e);
logger.error("Failed to associate ip " + ipToAssoc + " to vpc " + vpc, e);
throw new CloudRuntimeException("Failed to associate ip " + ipToAssoc + " to vpc " + vpc, e);
}