From ee1e32ddf342887ecf8323ea9a02c845c8b14b91 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Fri, 13 Oct 2017 16:44:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E4=B8=AD=E5=BF=83=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?xml=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/XXL-JOB官方文档.md                    |  3 ++-
 .../src/main/resources/log4j.properties       | 10 -------
 xxl-job-admin/src/main/resources/log4j.xml    | 27 +++++++++++++++++++
 3 files changed, 29 insertions(+), 11 deletions(-)
 delete mode 100644 xxl-job-admin/src/main/resources/log4j.properties
 create mode 100644 xxl-job-admin/src/main/resources/log4j.xml

diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index a7221e84..a540066f 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -1023,7 +1023,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
 - 2、失败告警策略扩展：默认提供邮件失败告警，可扩展短信等，扩展代码位置为 "JobFailMonitorHelper.failAlarm"；
 - 3、修复任务监控线程被耗时任务阻塞的问题；
 - 4、修复任务监控线程无法监控任务触发和执行状态均未0的问题；
-
+- 5、调度中心项目日志配置改为xml文件格式；
 
 ### TODO LIST
 - 1、任务权限管理：执行器为粒度分配权限，核心操作校验权限；
@@ -1041,6 +1041,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
 - 13、执行器Log清理功能：调度中心Log删除时同步删除执行器中的Log文件；
 - 14、脚本任务 Shell、Python和Nodejs，如何友好获取分片参数；
 - 15、Bean模式任务，JobHandler自动从执行器中查询展示为下拉框，选择后自动填充任务名称等属性；
+- 16、任务告警邮件优化，调整为表格形式；
 
 ## 七、其他
 
diff --git a/xxl-job-admin/src/main/resources/log4j.properties b/xxl-job-admin/src/main/resources/log4j.properties
deleted file mode 100644
index c9455ab0..00000000
--- a/xxl-job-admin/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-log4j.rootLogger=info,console,logFile
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d - xxl-job-admin - %p [%c] - <%m>%n
-
-log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.logFile.File=/data/applogs/xxl-job/xxl-job-admin.log
-log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logFile.layout.ConversionPattern=%d - xxl-job-admin - %p [%c] - <%m>%n
diff --git a/xxl-job-admin/src/main/resources/log4j.xml b/xxl-job-admin/src/main/resources/log4j.xml
new file mode 100644
index 00000000..b62da198
--- /dev/null
+++ b/xxl-job-admin/src/main/resources/log4j.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration PUBLIC "-//log4j/log4j Configuration//EN" "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" threshold="null" debug="null">
+
+	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.out" />
+		<layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%-d{yyyy-MM-dd HH:mm:ss} xxl-job-admin [%c]-[%t]-[%M]-[%L]-[%p] %m%n"/>
+		</layout>
+	</appender>
+	
+    <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="file" value="/data/applogs/xxl-job/xxl-job-admin.log"/>
+        <param name="append" value="true"/>
+        <param name="encoding" value="UTF-8"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%-d{yyyy-MM-dd HH:mm:ss} xxl-job-admin [%c]-[%t]-[%M]-[%L]-[%p] %m%n"/>
+        </layout>
+    </appender>
+
+    <root>
+        <level value="INFO" />
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="FILE" />
+    </root>
+
+</log4j:configuration>
\ No newline at end of file