From 9b836aa5dd5c71aced13d980306b82bab119353b Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@outlook.com>
Date: Fri, 11 Oct 2019 15:08:36 +0800
Subject: [PATCH] api server startup modify (#986)

* 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
---
 .../src/main/resources/application-api.properties             | 4 ++++
 script/dolphinscheduler-daemon.sh                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-api/src/main/resources/application-api.properties b/dolphinscheduler-api/src/main/resources/application-api.properties
index f956326cc..71ef666e5 100644
--- a/dolphinscheduler-api/src/main/resources/application-api.properties
+++ b/dolphinscheduler-api/src/main/resources/application-api.properties
@@ -1,3 +1,5 @@
+logging.config=classpath:apiserver_logback.xml
+
 # server port
 server.port=12345
 
@@ -17,3 +19,5 @@ spring.messages.encoding=UTF-8
 
 #i18n classpath folder , file prefix messages， if have many files, use "," seperator
 spring.messages.basename=i18n/messages
+
+
diff --git a/script/dolphinscheduler-daemon.sh b/script/dolphinscheduler-daemon.sh
index 45898a013..16ac8f36f 100644
--- a/script/dolphinscheduler-daemon.sh
+++ b/script/dolphinscheduler-daemon.sh
@@ -41,7 +41,7 @@ pid=$DOLPHINSCHEDULER_LOG_DIR/dolphinscheduler-$command.pid
 cd $DOLPHINSCHEDULER_HOME
 
 if [ "$command" = "api-server" ]; then
-  LOG_FILE="-Dlogging.config=conf/apiserver_logback.xml"
+  LOG_FILE="-Dspring.profiles.active=api"
   CLASS=org.apache.dolphinscheduler.api.ApiApplicationServer
 elif [ "$command" = "master-server" ]; then
   LOG_FILE="-Dspring.profiles.active=master -Ddruid.mysql.usePingMethod=false"
-- 
GitLab