From ee4fa9f6e6418562a0eaf45059e47972f7fe91b5 Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Sat, 12 Oct 2019 16:40:20 +0800
Subject: [PATCH] add log4j to resolve #967 (#1000)

* rename from DatasourceUserMapper to DataSourceUserMapper

* add unit test in UserMapper and WorkerGroupMapper

* change cn.escheduler to org.apache.dolphinscheduler

* add unit test in UdfFuncMapperTest

* add unit test in UdfFuncMapperTest

* remove DatabaseConfiguration

* add ConnectionFactoryTest

* cal duration in processInstancesList

* change desc to description

* change table name in mysql ddl

* change table name in mysql ddl

* change escheduler to dolphinscheduler

* change escheduler to dolphinscheduler

* change escheduler to dolphinscheduler

* remove log4j-1.2-api and modify AlertMapperTest

* remove log4j-1.2-api

* Add alertDao to spring management

* Add alertDao to spring management

* get SqlSessionFactory from MybatisSqlSessionFactoryBean

* get processDao by DaoFactory

* read druid properties in ConneciontFactory

* read druid properties in ConneciontFactory

* change get alertDao by spring to DaoFactory

* add log4j to resolve #967
---
 dolphinscheduler-common/pom.xml   | 4 ++--
 script/dolphinscheduler-daemon.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-common/pom.xml b/dolphinscheduler-common/pom.xml
index 6f873c6a9f..59c9055089 100644
--- a/dolphinscheduler-common/pom.xml
+++ b/dolphinscheduler-common/pom.xml
@@ -49,8 +49,8 @@
 			<version>2.12.0</version>
 			<exclusions>
 				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
+					<groupId>log4j-1.2-api</groupId>
+					<artifactId>org.apache.logging.log4j</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>io.netty</groupId>
diff --git a/script/dolphinscheduler-daemon.sh b/script/dolphinscheduler-daemon.sh
index 16ac8f36fb..f6dbf0ac21 100644
--- a/script/dolphinscheduler-daemon.sh
+++ b/script/dolphinscheduler-daemon.sh
@@ -50,7 +50,7 @@ elif [ "$command" = "worker-server" ]; then
   LOG_FILE="-Dspring.profiles.active=worker -Ddruid.mysql.usePingMethod=false"
   CLASS=org.apache.dolphinscheduler.server.worker.WorkerServer
 elif [ "$command" = "alert-server" ]; then
-  LOG_FILE="-Dspring.profiles.active=alert -Ddruid.mysql.usePingMethod=false"
+  LOG_FILE="-Dlogback.configurationFile=conf/alert_logback.xml"
   CLASS=org.apache.dolphinscheduler.alert.AlertServer
 elif [ "$command" = "logger-server" ]; then
   CLASS=org.apache.dolphinscheduler.server.rpc.LoggerServer