Skip to content

Commit 094107a

Browse files
vishesh92vishesh92
committed
Address comments
1 parent 598f856 commit 094107a

File tree

12 files changed

+2
-43
lines changed

12 files changed

+2
-43
lines changed

‎engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/BasePrimaryDataStoreLifeCycleImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.apache.logging.log4j.Logger;
4343

4444
public class BasePrimaryDataStoreLifeCycleImpl {
45-
private static final Logger logger = LogManager.getLogger(BasePrimaryDataStoreLifeCycleImpl.class);
45+
protected Logger logger = LogManager.getLogger(getClass());
4646

4747
@Inject
4848
AgentManager agentMgr;

‎plugins/storage/volume/adaptive/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/AdaptiveDataStoreLifeCycleImpl.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,13 @@
5757
import com.cloud.utils.crypt.DBEncryptionUtil;
5858
import com.cloud.utils.exception.CloudRuntimeException;
5959
import com.cloud.host.Host;
60-
import org.apache.logging.log4j.LogManager;
61-
import org.apache.logging.log4j.Logger;
6260

6361
/**
6462
* Manages the lifecycle of a Managed Data Store in CloudStack
6563
*/
6664
public class AdaptiveDataStoreLifeCycleImpl extends BasePrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLifeCycle {
6765
@Inject
6866
private PrimaryDataStoreDao _storagePoolDao;
69-
protected Logger logger = LogManager.getLogger(getClass());
70-
7167
@Inject
7268
PrimaryDataStoreHelper _dataStoreHelper;
7369
@Inject

‎plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626

2727
import javax.inject.Inject;
2828

29-
import org.apache.logging.log4j.Logger;
30-
import org.apache.logging.log4j.LogManager;
31-
3229
import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
3330
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
3431
import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
@@ -67,8 +64,6 @@
6764
import com.cloud.utils.exception.CloudRuntimeException;
6865

6966
public class ElastistorPrimaryDataStoreLifeCycle extends BasePrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLifeCycle {
70-
protected Logger logger = LogManager.getLogger(getClass());
71-
7267
@Inject
7368
HostDao _hostDao;
7469
@Inject

‎plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/DateraPrimaryDataStoreLifeCycle.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,13 @@
5151
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
5252
import org.apache.cloudstack.storage.datastore.util.DateraUtil;
5353
import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
54-
import org.apache.logging.log4j.Logger;
55-
import org.apache.logging.log4j.LogManager;
5654

5755
import javax.inject.Inject;
5856
import java.util.ArrayList;
5957
import java.util.List;
6058
import java.util.Map;
6159

6260
public class DateraPrimaryDataStoreLifeCycle extends BasePrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLifeCycle {
63-
protected Logger logger = LogManager.getLogger(getClass());
64-
6561
@Inject
6662
private CapacityManager _capacityMgr;
6763
@Inject

‎plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@
6464
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
6565
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
6666
import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
67-
import org.apache.logging.log4j.Logger;
68-
import org.apache.logging.log4j.LogManager;
6967

7068
import javax.inject.Inject;
7169
import java.util.ArrayList;
@@ -74,7 +72,6 @@
7472
import java.util.UUID;
7573

7674
public class CloudStackPrimaryDataStoreLifeCycleImpl extends BasePrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLifeCycle {
77-
protected Logger logger = LogManager.getLogger(getClass());
7875
@Inject
7976
protected ResourceManager _resourceMgr;
8077
@Inject

‎plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/LinstorPrimaryDataStoreLifeCycleImpl.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,8 @@
5151
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
5252
import org.apache.cloudstack.storage.datastore.util.LinstorUtil;
5353
import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
54-
import org.apache.logging.log4j.Logger;
55-
import org.apache.logging.log4j.LogManager;
5654

5755
public class LinstorPrimaryDataStoreLifeCycleImpl extends BasePrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLifeCycle {
58-
protected Logger logger = LogManager.getLogger(getClass());
59-
6056
@Inject
6157
private ClusterDao clusterDao;
6258
@Inject

‎plugins/storage/volume/nexenta/src/main/java/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import org.apache.cloudstack.storage.datastore.lifecycle.BasePrimaryDataStoreLifeCycleImpl;
3434
import org.apache.cloudstack.storage.datastore.util.NexentaUtil;
3535
import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
36-
import org.apache.logging.log4j.Logger;
37-
import org.apache.logging.log4j.LogManager;
3836

3937
import com.cloud.agent.api.StoragePoolInfo;
4038
import com.cloud.dc.DataCenterVO;
@@ -49,7 +47,6 @@
4947
public class NexentaPrimaryDataStoreLifeCycle
5048
extends BasePrimaryDataStoreLifeCycleImpl
5149
implements PrimaryDataStoreLifeCycle {
52-
protected Logger logger = LogManager.getLogger(getClass());
5350

5451
@Inject
5552
private DataCenterDao zoneDao;

‎plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/ScaleIOPrimaryDataStoreLifeCycle.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
4848
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
4949
import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
50-
import org.apache.logging.log4j.Logger;
51-
import org.apache.logging.log4j.LogManager;
5250

5351
import com.cloud.agent.AgentManager;
5452
import com.cloud.agent.api.Answer;
@@ -76,8 +74,6 @@
7674
import com.cloud.utils.exception.CloudRuntimeException;
7775

7876
public class ScaleIOPrimaryDataStoreLifeCycle extends BasePrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLifeCycle {
79-
protected Logger logger = LogManager.getLogger(getClass());
80-
8177
@Inject
8278
private ClusterDao clusterDao;
8379
@Inject

‎plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
@Component
5454
public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager {
55-
private static final Logger logger = LogManager.getLogger(ScaleIOSDCManagerImpl.class);
55+
private Logger logger = LogManager.getLogger(getClass());
5656

5757
@Inject
5858
AgentManager agentManager;

‎plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525

2626
import javax.inject.Inject;
2727

28-
import org.apache.logging.log4j.Logger;
29-
import org.apache.logging.log4j.LogManager;
30-
3128
import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
3229
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
3330
import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
@@ -65,8 +62,6 @@
6562
import com.google.common.base.Preconditions;
6663

6764
public class SolidFirePrimaryDataStoreLifeCycle extends BasePrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLifeCycle {
68-
protected Logger logger = LogManager.getLogger(getClass());
69-
7065
@Inject private CapacityManager _capacityMgr;
7166
@Inject private ClusterDao _clusterDao;
7267
@Inject private DataCenterDao _zoneDao;

0 commit comments

Comments
 (0)