Cherry pick tracer log config(#115) (#128)

* fix tracer log config
sofastack · Nov 16, 2018 · e7844c7 · e7844c7
1 parent 6958ca8
commit e7844c7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 147 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-dependencies</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2</version>
     </parent>
 
     <artifactId>tracer-all-parent</artifactId>

diff --git a/tracer-samples/tracer-sample-with-sofarpc/pom.xml b/tracer-samples/tracer-sample-with-sofarpc/pom.xml
@@ -25,7 +25,6 @@
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>rpc-sofa-boot-starter</artifactId>
-            <version>5.4.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -35,14 +34,7 @@
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>infra-sofa-boot-starter</artifactId>
-            <version>2.4.6</version>
         </dependency>
-        <dependency>
-            <groupId>com.alipay.sofa</groupId>
-            <artifactId>sofa-rpc-all</artifactId>
-            <version>5.4.0</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

diff --git a/...r/src/main/java/com/alipay/sofa/tracer/boot/listener/SofaTracerConfigurationListener.java b/...r/src/main/java/com/alipay/sofa/tracer/boot/listener/SofaTracerConfigurationListener.java
@@ -50,6 +50,12 @@ public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
             return;
         }
 
+        // set loggingPath
+        String loggingPath = environment.getProperty("logging.path");
+        if (StringUtils.isNotBlank(loggingPath)) {
+            System.setProperty("logging.path", loggingPath);
+        }
+
         // check spring.application.name
         String applicationName = environment
             .getProperty(SofaTracerConfiguration.TRACER_APPNAME_KEY);
@@ -58,12 +64,6 @@ public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
         SofaTracerConfiguration.setProperty(SofaTracerConfiguration.TRACER_APPNAME_KEY,
             applicationName);
 
-        // set loggingPath
-        String loggingPath = environment.getProperty("logging.path");
-        if (StringUtils.isNotBlank(loggingPath)) {
-            System.setProperty("logging.path", loggingPath);
-        }
-
         SofaTracerProperties tempTarget = new SofaTracerProperties();
         PropertiesConfigurationFactory<SofaTracerProperties> binder = new PropertiesConfigurationFactory<SofaTracerProperties>(
             tempTarget);

diff --git a/...sofa-boot-starter/src/test/java/com/alipay/sofa/tracer/boot/config/ConfigurationTest.java b/...sofa-boot-starter/src/test/java/com/alipay/sofa/tracer/boot/config/ConfigurationTest.java
diff --git a/...ot-starter/src/test/java/com/alipay/sofa/tracer/boot/config/SofaTracerPropertiesTest.java b/...ot-starter/src/test/java/com/alipay/sofa/tracer/boot/config/SofaTracerPropertiesTest.java
diff --git a/tracer-sofa-boot-starter/src/test/resources/application-config.properties b/tracer-sofa-boot-starter/src/test/resources/application-config.properties
@@ -6,3 +6,4 @@ com.alipay.sofa.tracer.tracerGlobalRollingPolicy='.'yyyy-MM-dd_HH
 com.alipay.sofa.tracer.tracerGlobalLogReserveDay=1
 com.alipay.sofa.tracer.statLogInterval=1
 com.alipay.sofa.tracer.baggageMaxLength=1
+logging.path=./logs