From 477beaffbf9b31ea83cc44555156f5b682f6df78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Jandre?= <48719461+JoaoJandre@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:12:44 -0300 Subject: [PATCH] merge conflicts (in loggers) --- .../src/main/java/com/cloud/network/IpAddressManagerImpl.java | 2 +- server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java index c67cfa8fb042..e6be174abcd7 100644 --- a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java +++ b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java @@ -1569,7 +1569,7 @@ public IPAddressVO associateIPToGuestNetwork(long ipId, long networkId, boolean } 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) { diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java index e78a88b09c93..b956ccc16ed9 100644 --- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java @@ -3195,7 +3195,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) { } }); } 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); }