Browse Source

.escheduler_env.sh to dolphinscheduler_env.sh (#941)

* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml

* .escheduler_env.sh to dolphinscheduler_env.sh
qiaozhanwei 5 years ago
parent
commit
070fd51145

+ 1 - 1
dolphinscheduler-common/src/main/resources/common/common.properties

@@ -32,7 +32,7 @@ login.user.keytab.username=hdfs-mycluster@ESZ.COM
 login.user.keytab.path=/opt/hdfs.headless.keytab
 
 # system env path. self configuration, please make sure the directory and file exists and have read write execute permissions
-escheduler.env.path=/opt/.escheduler_env.sh
+escheduler.env.path=/opt/.dolphinscheduler_env.sh
 
 #resource.view.suffixs
 resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml

+ 1 - 1
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java

@@ -17,7 +17,7 @@ public class EnvFileTest {
 
     @Test
     public void test() {
-        String path = System.getProperty("user.dir")+"/script/env/.escheduler_env.sh";
+        String path = System.getProperty("user.dir")+"/script/env/.dolphinscheduler_env.sh";
         String pythonHome = getPythonHome(path);
         logger.info(pythonHome);
     }

+ 1 - 1
install.sh

@@ -161,7 +161,7 @@ downloadPath="/tmp/escheduler/download"
 execPath="/tmp/escheduler/exec"
 
 # SHELL environmental variable path
-shellEnvPath="$installPath/conf/env/.escheduler_env.sh"
+shellEnvPath="$installPath/conf/env/.dolphinscheduler_env.sh"
 
 # suffix of the resource file
 resSuffixs="txt,log,sh,conf,cfg,py,java,sql,hql,xml"

script/env/.escheduler_env.sh → script/env/.dolphinscheduler_env.sh