Browse Source

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
pull/2/head
lgcareer 5 years ago committed by bao liang
parent
commit
ee4fa9f6e6
  1. 4
      dolphinscheduler-common/pom.xml
  2. 2
      script/dolphinscheduler-daemon.sh

4
dolphinscheduler-common/pom.xml

@ -49,8 +49,8 @@
<version>2.12.0</version> <version>2.12.0</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>log4j</groupId> <groupId>log4j-1.2-api</groupId>
<artifactId>log4j</artifactId> <artifactId>org.apache.logging.log4j</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>

2
script/dolphinscheduler-daemon.sh

@ -50,7 +50,7 @@ elif [ "$command" = "worker-server" ]; then
LOG_FILE="-Dspring.profiles.active=worker -Ddruid.mysql.usePingMethod=false" LOG_FILE="-Dspring.profiles.active=worker -Ddruid.mysql.usePingMethod=false"
CLASS=org.apache.dolphinscheduler.server.worker.WorkerServer CLASS=org.apache.dolphinscheduler.server.worker.WorkerServer
elif [ "$command" = "alert-server" ]; then 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 CLASS=org.apache.dolphinscheduler.alert.AlertServer
elif [ "$command" = "logger-server" ]; then elif [ "$command" = "logger-server" ]; then
CLASS=org.apache.dolphinscheduler.server.rpc.LoggerServer CLASS=org.apache.dolphinscheduler.server.rpc.LoggerServer

Loading…
Cancel
Save