Commit 738d1564 authored by 吴晟's avatar 吴晟
Browse files

Recover logging-api/logging-log4j2 modules. Adjust codes for new modules.

parent 2fb18ebc

skywalking-collector/pom.xml

+1 −32
Original line number Diff line number Diff line
@@ -24,36 +24,6 @@ 
            <artifactId>akka-cluster_2.11</artifactId>

            <version>${akka.version}</version>

        </dependency>

        <dependency>

            <groupId>com.typesafe.akka</groupId>

            <artifactId>akka-cluster-metrics_2.11</artifactId>

            <version>${akka.version}</version>

        </dependency>

        <dependency>

            <groupId>com.typesafe.akka</groupId>

            <artifactId>akka-cluster-tools_2.11</artifactId>

            <version>${akka.version}</version>

        </dependency>

        <dependency>

            <groupId>com.typesafe.akka</groupId>

            <artifactId>akka-persistence_2.11</artifactId>

            <version>${akka.version}</version>

        </dependency>

        <dependency>

            <groupId>org.iq80.leveldb</groupId>

            <artifactId>leveldb</artifactId>

            <version>0.9</version>

        </dependency>

        <dependency>

            <groupId>org.apache.logging.log4j</groupId>

            <artifactId>log4j-core</artifactId>

            <version>2.8</version>

        </dependency>

        <dependency>

            <groupId>org.apache.logging.log4j</groupId>

            <artifactId>log4j-api</artifactId>

            <version>2.8</version>

        </dependency>

        <dependency>

            <groupId>com.typesafe.akka</groupId>

            <artifactId>akka-testkit_2.11</artifactId>
@@ -62,9 +32,8 @@ 
        </dependency>

        <dependency>

            <groupId>com.a.eye</groupId>

            <artifactId>skywalking-sniffer-mock</artifactId>

            <artifactId>skywalking-logging-api</artifactId>

            <version>${project.version}</version>

            <scope>test</scope>

        </dependency>

    </dependencies>

</project>

skywalking-collector/skywalking-collector-cluster/pom.xml

+4 −9
Original line number Diff line number Diff line
@@ -17,19 +17,14 @@ 


    <dependencies>

        <dependency>

            <groupId>javax.inject</groupId>

            <artifactId>javax.inject</artifactId>

            <version>1</version>

            <groupId>com.a.eye</groupId>

            <artifactId>skywalking-util</artifactId>

            <version>${project.version}</version>

        </dependency>

        <dependency>

            <groupId>com.lmax</groupId>

            <artifactId>disruptor</artifactId>

            <version>3.3.6</version>

        </dependency>

        <dependency>

            <groupId>com.a.eye</groupId>

            <artifactId>skywalking-api</artifactId>

            <version>${project.version}</version>

        </dependency>

    </dependencies>

</project>

skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractMember.java

+3 −4
Original line number Diff line number Diff line
@@ -4,10 +4,9 @@ import akka.actor.ActorRef; 
import com.a.eye.skywalking.collector.actor.selector.WorkerSelector;

import com.a.eye.skywalking.collector.cluster.WorkersRefCenter;

import com.a.eye.skywalking.collector.queue.MessageHolder;

import com.a.eye.skywalking.logging.ILog;

import com.a.eye.skywalking.logging.LogManager;

import com.lmax.disruptor.EventHandler;

import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;



import java.util.List;



/**
@@ -15,7 +14,7 @@ import java.util.List; 
 */

public abstract class AbstractMember implements EventHandler<MessageHolder> {



    private Logger logger = LogManager.getFormatterLogger(AbstractMember.class);

    private ILog logger = LogManager.getLogger(AbstractMember.class);



    private ActorRef actorRef;

skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java

+3 −4
Original line number Diff line number Diff line
@@ -9,9 +9,8 @@ import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; 
import com.a.eye.skywalking.collector.cluster.WorkerListenerMessage;

import com.a.eye.skywalking.collector.cluster.WorkersListener;

import com.a.eye.skywalking.collector.cluster.WorkersRefCenter;

import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;



import com.a.eye.skywalking.logging.ILog;

import com.a.eye.skywalking.logging.LogManager;

import java.util.List;



/**
@@ -40,7 +39,7 @@ import java.util.List; 
 */

public abstract class AbstractWorker extends UntypedActor {



    private Logger logger = LogManager.getFormatterLogger(AbstractWorker.class);

    private ILog logger = LogManager.getLogger(AbstractWorker.class);



    private Cluster cluster = Cluster.get(getContext().system());

skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java

+3 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ package com.a.eye.skywalking.collector.actor; 


import akka.actor.ActorSystem;

import akka.actor.Props;

import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;

import com.a.eye.skywalking.logging.ILog;

import com.a.eye.skywalking.logging.LogManager;



/**

 * The <code>AbstractWorkerProvider</code> should be implemented by any class whose
@@ -28,8 +28,7 @@ import org.apache.logging.log4j.Logger; 
 * <p>

 */

public abstract class AbstractWorkerProvider {



    private Logger logger = LogManager.getFormatterLogger(AbstractWorkerProvider.class);

    private ILog logger = LogManager.getLogger(AbstractWorkerProvider.class);



    public abstract Class workerClass();