fixed github issue alibaba#124, alibaba#139

YaoLin1 · Dec 10, 2015 · a59a67c · a59a67c
1 parent 6dc60b0
commit a59a67c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/jstorm-ui/pom.xml b/jstorm-ui/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.alibaba.jstorm</groupId>
@@ -26,12 +28,6 @@
             <groupId>com.alibaba.jstorm</groupId>
             <artifactId>jstorm-core</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- Servlet -->
@@ -71,14 +67,14 @@
             <version>2.5.1</version>
         </dependency>
 
-        <!-- Logging -->
+        <!-- exclude log4j-slf4j12 since we bridge slf4j to logback -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <version>${slf4j.version}</version>
+            <scope>provided</scope>
         </dependency>
 
-
         <!-- Test -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -92,8 +88,6 @@
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
-
-
     </dependencies>
 
     <build>

diff --git a/jstorm-ui/src/main/resources/logback.xml b/jstorm-ui/src/main/resources/logback.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration>
-    <property name="LOG_HOME" value="/Users/wuchong/logs/jstorm" />
-
     <appender name="PROJECT" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_HOME}/jstorm.ui.log</file>
+        <file>${LOG_HOME:-.}/jstorm.ui.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_HOME}/jstorm.ui.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <fileNamePattern>${LOG_HOME:-.}/jstorm.ui.log.%d{yyyy-MM-dd}</fileNamePattern>
             <maxHistory>7</maxHistory>
         </rollingPolicy>
         <encoder>
@@ -15,9 +13,9 @@
         </encoder>
     </appender>
     <appender name="APACHE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_HOME}/jstorm.apache.log</file>
+        <file>${LOG_HOME:-.}/jstorm.apache.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_HOME}/jstorm.apache.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <fileNamePattern>${LOG_HOME:-.}/jstorm.apache.log.%d{yyyy-MM-dd}</fileNamePattern>
             <maxHistory>7</maxHistory>
         </rollingPolicy>
         <encoder>
@@ -40,4 +38,4 @@
     <root level="INFO">
         <appender-ref ref="PROJECT"/>
     </root>
-</configuration>
+</configuration>