Browse Source

Add alertDao to spring management (#978)

* 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
pull/2/head
lgcareer 5 years ago committed by qiaozhanwei
parent
commit
84c3e9e5bc
  1. 2
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java

2
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java

@ -42,7 +42,7 @@ public class CombinedApplicationServer extends SpringBootServletInitializer {
ProcessDao processDao = context.getBean(ProcessDao.class); ProcessDao processDao = context.getBean(ProcessDao.class);
AlertDao alertDao = context.getBean(AlertDao.class); AlertDao alertDao = context.getBean(AlertDao.class);
MasterServer master = new MasterServer(processDao); MasterServer master = new MasterServer(processDao,alertDao);
master.run(processDao); master.run(processDao);
WorkerServer workerServer = new WorkerServer(processDao, alertDao); WorkerServer workerServer = new WorkerServer(processDao, alertDao);

Loading…
Cancel
Save