diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java index e5a5f8a03..db842e428 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java @@ -1,9 +1,15 @@ package com.a.eye.skywalking.collector.actor; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + /** * @author pengys5 */ public abstract class AbstractWorker { + + private final Logger logger; + private final LocalWorkerContext selfContext; private final Role role; @@ -14,6 +20,11 @@ public abstract class AbstractWorker { this.role = role; this.clusterContext = clusterContext; this.selfContext = selfContext; + this.logger = LogManager.getFormatterLogger(role.roleName()); + } + + final public Logger logger() { + return logger; } public abstract void preStart() throws ProviderNotFoundException; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java index c4c912c8e..0f2edfcab 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java @@ -6,12 +6,16 @@ import com.a.eye.skywalking.collector.actor.Role; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.worker.storage.RecordAnalysisData; import com.google.gson.JsonObject; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @author pengys5 */ public abstract class RecordAnalysisMember extends AnalysisMember { + private Logger logger = LogManager.getFormatterLogger(RecordAnalysisMember.class); + private RecordAnalysisData recordAnalysisData = new RecordAnalysisData(); public RecordAnalysisMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { @@ -26,13 +30,12 @@ public abstract class RecordAnalysisMember extends AnalysisMember { return recordAnalysisData; } - @Override - final protected void aggregation() throws Exception { + @Override final protected void aggregation() throws Exception { getRecordAnalysisData().asMap().forEach((key, value) -> { try { aggWorkRefs().tell(value); } catch (Exception e) { - e.printStackTrace(); + logger.error(e); } }); getRecordAnalysisData().asMap().clear(); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java index 84cf9ade2..c0dc184c8 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java @@ -8,8 +8,6 @@ import com.a.eye.skywalking.collector.worker.storage.RecordData; import com.a.eye.skywalking.collector.worker.storage.RecordPersistenceData; import java.util.List; import java.util.Map; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.client.Client; @@ -18,8 +16,6 @@ import org.elasticsearch.client.Client; */ public abstract class RecordPersistenceMember extends PersistenceMember { - private Logger logger = LogManager.getFormatterLogger(RecordPersistenceMember.class); - public RecordPersistenceMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -33,13 +29,13 @@ public abstract class RecordPersistenceMember extends PersistenceMember list = (List)testAField.get(workerRefs); + + Assert.assertEquals(workerRef, list.get(0)); + } +}