You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/01/09 06:27:19 UTC
[incubator-servicecomb-java-chassis] 08/13: SCB-85 fix PR comment
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 5917f1888a829e196c386b7f8ee238e4bbcd1867
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Thu Jan 4 16:33:53 2018 +0800
SCB-85 fix PR comment
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
java-chassis-dependencies/pom.xml | 11 +++++++++++
.../metrics-write-file-config-log4j2/pom.xml | 2 --
.../extension/writefile/config/Log4J2MetricsFileWriter.java | 5 ++---
.../java/io/servicecomb/samples/mwf/ServiceApplication.java | 2 +-
.../java/io/servicecomb/samples/mwf/ServiceApplication.java | 2 +-
5 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/java-chassis-dependencies/pom.xml b/java-chassis-dependencies/pom.xml
index 70f1c02..36adaa3 100644
--- a/java-chassis-dependencies/pom.xml
+++ b/java-chassis-dependencies/pom.xml
@@ -36,6 +36,7 @@
<spring.version>4.3.5.RELEASE</spring.version>
<slf4j.version>1.7.7</slf4j.version>
<log4j.version>1.2.17</log4j.version>
+ <log4j2.version>2.8.2</log4j2.version>
<commons.io.version>2.4</commons.io.version>
<javassist.version>3.18.1-GA</javassist.version>
<javax.ws.rs.version>2.0.1</javax.ws.rs.version>
@@ -520,6 +521,16 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
diff --git a/metrics/metrics-extension/metrics-write-file-config-log4j2/pom.xml b/metrics/metrics-extension/metrics-write-file-config-log4j2/pom.xml
index 9a5583c..dde9d09 100644
--- a/metrics/metrics-extension/metrics-write-file-config-log4j2/pom.xml
+++ b/metrics/metrics-extension/metrics-write-file-config-log4j2/pom.xml
@@ -37,12 +37,10 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.8.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.8.2</version>
</dependency>
</dependencies>
diff --git a/metrics/metrics-extension/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/extension/writefile/config/Log4J2MetricsFileWriter.java b/metrics/metrics-extension/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/extension/writefile/config/Log4J2MetricsFileWriter.java
index daaddad..54f9818 100644
--- a/metrics/metrics-extension/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/extension/writefile/config/Log4J2MetricsFileWriter.java
+++ b/metrics/metrics-extension/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/extension/writefile/config/Log4J2MetricsFileWriter.java
@@ -76,10 +76,9 @@ public class Log4J2MetricsFileWriter implements MetricsFileWriter {
DefaultRolloverStrategy strategy = DefaultRolloverStrategy.createStrategy(String.valueOf(maxFileCount), null, null,
null, null, false, config);
- //TODO:in version 2.8 + , log4j2 request use RollingFileAppender.newBuilder,but throw No such static method exception
- RollingFileAppender appender = RollingFileAppender
+ //TODO:use RollingFileAppender.newBuilder throw No such static method exception,will improve later!
+ return RollingFileAppender
.createAppender(fileName, filePattern, "true", loggerName, "true", null,
"true", policy, strategy, layout, null, null, null, null, config);
- return appender;
}
}
diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java b/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java
index a4668dc..bfb4354 100644
--- a/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java
+++ b/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java
@@ -25,7 +25,7 @@ import io.servicecomb.springboot.starter.provider.EnableServiceComb;
@SpringBootApplication
@EnableServiceComb
public class ServiceApplication {
- public static void main(String[] args) throws Exception {
+ public static void main(String[] args) {
SpringApplication.run(ServiceApplication.class, args);
}
}
diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java b/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java
index a4668dc..bfb4354 100644
--- a/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java
+++ b/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java
@@ -25,7 +25,7 @@ import io.servicecomb.springboot.starter.provider.EnableServiceComb;
@SpringBootApplication
@EnableServiceComb
public class ServiceApplication {
- public static void main(String[] args) throws Exception {
+ public static void main(String[] args) {
SpringApplication.run(ServiceApplication.class, args);
}
}
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.