Maor Lipchuk has uploaded a new change for review.
Change subject: core:StorageHelper cleanup, use one log declaration.
......................................................................
core:StorageHelper cleanup, use one log declaration.
Declare log only at StorageHelperBase instead in each helper class.
Change-Id: I340b2dfd4b374e816068fb91fdc0fae70ce3bbbc
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/LOCALFSStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/NFSStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/POSIXFSStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
6 files changed, 6 insertions(+), 33 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/10139/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
index 1fdaf68..40a754a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
@@ -18,7 +18,6 @@
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-import org.ovirt.engine.core.utils.log.Log;
public abstract class BaseFsStorageHelper extends StorageHelperBase {
@@ -33,7 +32,7 @@
.runInternalAction(VdcActionType.forValue(type),
new
StorageServerConnectionParametersBase(connection, vdsId)).getSucceeded();
} else {
- getLog().warn("Did not connect host: " + vdsId + " to storage
domain: " + storageDomain.getstorage_name()
+ log.warn("Did not connect host: " + vdsId + " to storage domain: "
+ storageDomain.getstorage_name()
+ " because connection for connectionId:" +
storageDomain.getstorage() + " is null.");
}
return returnValue;
@@ -60,7 +59,7 @@
for (Map.Entry<String, String> entry : returnValue.entrySet()) {
if (!"0".equals(entry.getValue())) {
String connectionField =
addToAuditLogErrorMessage(entry.getKey(), entry.getValue(), connections);
- printLog(getLog(), connectionField, entry.getValue());
+ printLog(log, connectionField, entry.getValue());
result = false;
}
}
@@ -87,8 +86,6 @@
return true;
}
-
- protected abstract Log getLog();
protected abstract StorageType getType();
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
index caf7912..36afe34 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
@@ -26,8 +26,6 @@
public class ISCSIStorageHelper extends StorageHelperBase {
- protected static final Log log =
LogFactory.getLog(ISCSIStorageHelper.class);
-
@Override
protected boolean runConnectionStorageToDomain(storage_domains
storageDomain, Guid vdsId, int type) {
return runConnectionStorageToDomain(storageDomain, vdsId, type, null,
Guid.Empty);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/LOCALFSStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/LOCALFSStorageHelper.java
index 1a9e8e9..3ad0dc6 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/LOCALFSStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/LOCALFSStorageHelper.java
@@ -1,16 +1,8 @@
package org.ovirt.engine.core.bll.storage;
import org.ovirt.engine.core.common.businessentities.StorageType;
-import org.ovirt.engine.core.utils.log.Log;
-import org.ovirt.engine.core.utils.log.LogFactory;
public class LOCALFSStorageHelper extends BaseFsStorageHelper {
- @Override
- protected Log getLog() {
- return log;
- }
-
- private static Log log = LogFactory.getLog(LOCALFSStorageHelper.class);
@Override
protected StorageType getType() {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/NFSStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/NFSStorageHelper.java
index 47211b7..c63e78c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/NFSStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/NFSStorageHelper.java
@@ -1,17 +1,8 @@
package org.ovirt.engine.core.bll.storage;
import org.ovirt.engine.core.common.businessentities.StorageType;
-import org.ovirt.engine.core.utils.log.Log;
-import org.ovirt.engine.core.utils.log.LogFactory;
public class NFSStorageHelper extends BaseFsStorageHelper {
-
- @Override
- protected Log getLog() {
- return log;
- }
-
- private static Log log = LogFactory.getLog(NFSStorageHelper.class);
@Override
protected StorageType getType() {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/POSIXFSStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/POSIXFSStorageHelper.java
index 880520b..aaecf40 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/POSIXFSStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/POSIXFSStorageHelper.java
@@ -1,20 +1,11 @@
package org.ovirt.engine.core.bll.storage;
import org.ovirt.engine.core.common.businessentities.StorageType;
-import org.ovirt.engine.core.utils.log.Log;
-import org.ovirt.engine.core.utils.log.LogFactory;
/**
* Storage helper for Posix FS connections
*/
public class POSIXFSStorageHelper extends BaseFsStorageHelper {
-
- @Override
- protected Log getLog() {
- return log;
- }
-
- private static final Log log =
LogFactory.getLog(POSIXFSStorageHelper.class);
@Override
protected StorageType getType() {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
index 9ad602c..75ff434 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
@@ -20,8 +20,12 @@
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
import org.ovirt.engine.core.dao.LunDAO;
import org.ovirt.engine.core.utils.log.Log;
+import org.ovirt.engine.core.utils.log.LogFactory;
public abstract class StorageHelperBase implements IStorageHelper {
+
+ protected final Log log = LogFactory.getLog(getClass());
+
@Override
public boolean connectStorageToDomainByStoragePoolId(storage_domains
storageDomain, Guid storagePoolId) {
return runForSingleConnectionInHost(storageDomain, storagePoolId,
VdcActionType.ConnectStorageToVds.getValue());
--
To view, visit http://gerrit.ovirt.org/10139
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I340b2dfd4b374e816068fb91fdc0fae70ce3bbbc
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
