(cloudstack) branch main updated: merge conflicts (in loggers)

[joao]

This is an automated email from the ASF dual-hosted git repository.

joao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 477beaffbf9 merge conflicts (in loggers)
477beaffbf9 is described below

commit 477beaffbf9b31ea83cc44555156f5b682f6df78
Author: João Jandre <48719461+joaojan...@users.noreply.github.com>
AuthorDate: Thu Sep 19 15:12:44 2024 -0300

    merge conflicts (in loggers)
---
 server/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 c67cfa8fb04..e6be174abcd 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 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) {
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 e78a88b09c9..b956ccc16ed 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 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);
         }