merge conflicts (in loggers)

gzhao9 · Sep 19, 2024 · 477beaf · 477beaf
1 parent 41e7a2a
commit 477beaf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
         }