rename logger to prevent merge forward conflict
diff --git a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHAProvider.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHAProvider.java
index 4804310..b429ef2 100644
--- a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHAProvider.java
+++ b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/kvm/ha/KVMHAProvider.java
@@ -41,7 +41,7 @@
import java.security.InvalidParameterException;
public final class KVMHAProvider extends HAAbstractHostProvider implements HAProvider<Host>, Configurable {
- private final static Logger LOG = Logger.getLogger(KVMHAProvider.class);
+ private final static Logger logger = Logger.getLogger(KVMHAProvider.class);
@Inject
protected KVMHostActivityChecker hostActivityChecker;
@@ -76,11 +76,11 @@
final OutOfBandManagementResponse resp = outOfBandManagementService.executePowerOperation(r, PowerOperation.RESET, null);
return resp.getSuccess();
} else {
- LOG.warn("OOBM recover operation failed for the host " + r.getName());
+ logger.warn("OOBM recover operation failed for the host " + r.getName());
return false;
}
} catch (Exception e){
- LOG.warn("OOBM service is not configured or enabled for this host " + r.getName() + " error is " + e.getMessage());
+ logger.warn("OOBM service is not configured or enabled for this host " + r.getName() + " error is " + e.getMessage());
throw new HARecoveryException(" OOBM service is not configured or enabled for this host " + r.getName(), e);
}
}
