From 370e55fd48b8b6a2b57554aa5994eefc4ca076fd Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Sat, 12 Oct 2019 19:31:55 +0800 Subject: [PATCH] ProcessDao is null bug fix (#1004) * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml * .escheduler_env.sh to dolphinscheduler_env.sh * dao yml assembly to conf directory * table name modify * entity title table name modify * logback log name modify * running through the big process * running through the big process error modify * logback log name modify * data_source.properties rename * logback log name modify * install.sh optimization * install.sh optimization * command count modify * command state update * countCommandState sql update * countCommandState sql update * remove application.yml file * master.properties modify * install.sh modify * install.sh modify * api server startup modify * the current user quits and the session is completely emptied. bug fix * remove pom package resources * checkQueueNameExist method update * checkQueueExist * install.sh error output update * signOut error update * ProcessDao is null bug fix --- .../apache/dolphinscheduler/server/worker/WorkerServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java index a2acf9bb2..b279c9224 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java @@ -162,7 +162,7 @@ public class WorkerServer extends AbstractServer { scheduleAtFixedRate(heartBeatThread, 5, heartBeatInterval, TimeUnit.SECONDS); // kill process thread implement - Runnable killProcessThread = getKillProcessThread(); + Runnable killProcessThread = getKillProcessThread(processDao); // submit kill process thread killExecutorService.execute(killProcessThread); @@ -288,7 +288,7 @@ public class WorkerServer extends AbstractServer { * kill process thread implement * @return */ - private Runnable getKillProcessThread(){ + private Runnable getKillProcessThread(ProcessDao processDao){ Runnable killProcessThread = new Runnable() { @Override public void run() { -- GitLab