|
|
@@ -227,7 +227,7 @@ function init:jenkins_agent() {
|
|
|
local host="127.0.0.1"
|
|
|
local agent_dir=``
|
|
|
local agent_file="${BASE_DIR}/agent.jar"
|
|
|
- local java_mem_opts=' -DappName=jenkins -server -Xmx1g'
|
|
|
+ local java_mem_opts='-server -Xmx1g'
|
|
|
local database_opts=' -Ddatabase.codeset=ISO-8859-1 -Ddatabase.logging=false'
|
|
|
local java_opts_ext=' -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dapplication.codeset=UTF-8 -Dfile.encoding=UTF-8 -Duser.timezone=Asia/Shanghai'
|
|
|
command::exec "${host}" "
|
|
|
@@ -247,10 +247,11 @@ workDir='${BASE_DIR}/workspace'
|
|
|
#-------------------------------------------------------------------
|
|
|
java='${BASE_DIR}/env/java/${JDK11_DIR_NAME}/bin/java'
|
|
|
agent_file='$agent_file'
|
|
|
-java_mem_opts='$java_opts_ext'
|
|
|
+java_mem_opts=' -DappName=jenkins-agent $java_opts_ext'
|
|
|
database_opts='$database_opts'
|
|
|
java_opts_ext='$java_opts_ext'
|
|
|
#-------------------------------------------------------------------
|
|
|
+
|
|
|
pid=\\\`ps -ef | grep 'DappName=jenkins-agent' | grep -v 'grep' | awk '{print \\\$2}'\\\`
|
|
|
if [ -z \\\$pid ];then
|
|
|
nohup \\\$java \\\$java_mem_opts \\\$database_opts \\\$java_opts_ext -jar \\\$agent_file -jnlpUrl \\\$jnlpUrl -secret \\\$secret -workDir \\\$workDir >${BASE_DIR}/agent-logs.log 2>&1 &
|
