Skip to content

Commit 608bdef

Browse files
committed
fix compile error
1 parent 49fa4d7 commit 608bdef

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

core/pom.xml

+13-1
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,18 @@
216216
<scope>provided</scope>
217217
<optional>true</optional>
218218
</dependency>
219+
<dependency>
220+
<groupId>commons-lang</groupId>
221+
<artifactId>commons-lang</artifactId>
222+
<version>2.6</version>
223+
<scope>compile</scope>
224+
</dependency>
225+
<dependency>
226+
<groupId>com.google.guava</groupId>
227+
<artifactId>guava</artifactId>
228+
<version>27.0.1-jre</version>
229+
<scope>compile</scope>
230+
</dependency>
219231
</dependencies>
220232

221-
</project>
233+
</project>

core/src/main/java/com/taobao/arthas/core/command/express/MvelExpress.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.taobao.arthas.core.command.express;
22

3-
import com.taobao.arthas.core.util.LogUtil;
4-
import com.taobao.middleware.logger.Logger;
3+
import com.alibaba.arthas.deps.org.slf4j.Logger;
4+
import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
55

66
/**
77
* @author xhinliang
88
*/
99
public class MvelExpress implements Express {
1010

11-
private final Logger logger = LogUtil.getArthasLogger();
11+
private static final Logger logger = LoggerFactory.getLogger(MvelExpress.class);
1212

1313
private final MvelEvalKiller evalKiller;
1414

@@ -21,7 +21,7 @@ public Object get(String express) throws ExpressException {
2121
try {
2222
return evalKiller.eval(express);
2323
} catch (Exception e) {
24-
logger.error(null, "Error during evaluating the expression:", e);
24+
logger.error("Error during evaluating the expression:", e);
2525
throw new ExpressException(express, e);
2626
}
2727
}

core/src/main/java/com/taobao/arthas/core/command/klass100/MvelCommand.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
import org.apache.commons.lang.exception.ExceptionUtils;
66

7+
import com.alibaba.arthas.deps.org.slf4j.Logger;
8+
import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
79
import com.google.common.base.Joiner;
810
import com.taobao.arthas.core.command.Constants;
911
import com.taobao.arthas.core.command.express.Express;
@@ -13,15 +15,13 @@
1315
import com.taobao.arthas.core.shell.command.AnnotatedCommand;
1416
import com.taobao.arthas.core.shell.command.Command;
1517
import com.taobao.arthas.core.shell.command.CommandProcess;
16-
import com.taobao.arthas.core.util.LogUtil;
1718
import com.taobao.arthas.core.util.StringUtils;
1819
import com.taobao.arthas.core.view.ObjectView;
1920
import com.taobao.middleware.cli.annotations.Argument;
2021
import com.taobao.middleware.cli.annotations.Description;
2122
import com.taobao.middleware.cli.annotations.Name;
2223
import com.taobao.middleware.cli.annotations.Option;
2324
import com.taobao.middleware.cli.annotations.Summary;
24-
import com.taobao.middleware.logger.Logger;
2525

2626
/**
2727
*
@@ -41,7 +41,7 @@
4141
)
4242
public class MvelCommand extends AnnotatedCommand {
4343

44-
private static final Logger logger = LogUtil.getArthasLogger();
44+
private static final Logger logger = LoggerFactory.getLogger(MvelCommand.class);
4545

4646
private String express;
4747

core/src/main/java/com/taobao/arthas/core/util/ArthasBanner.java

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
package com.taobao.arthas.core.util;
22

3-
import com.alibaba.arthas.deps.org.slf4j.Logger;
4-
import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
5-
import com.taobao.arthas.common.PidUtils;
6-
import com.taobao.arthas.core.shell.ShellServerOptions;
7-
import com.taobao.text.Color;
8-
import com.taobao.text.Decoration;
9-
import com.taobao.text.ui.TableElement;
10-
import com.taobao.text.util.RenderUtil;
11-
123
import java.io.InputStream;
134
import java.util.Collections;
145
import java.util.Map;
156
import java.util.Map.Entry;
167

8+
import com.alibaba.arthas.deps.org.slf4j.Logger;
9+
import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
1710
import com.taobao.arthas.common.PidUtils;
1811
import com.taobao.arthas.core.shell.ShellServerOptions;
19-
import com.taobao.middleware.logger.Logger;
2012
import com.taobao.text.ui.TableElement;
2113
import com.taobao.text.util.RenderUtil;
2214

0 commit comments

Comments
 (0)