Skip to content

Commit 65dc538

Browse files
authored
Merge pull request #5 from gnsuryan/merge-main-to-test
merge change in main to test
2 parents bc1c91c + ef57d19 commit 65dc538

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

.github/workflows/testWlsVmAdmin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ env:
4545

4646
jobs:
4747
preflight:
48-
runs-on: gurucicdrunner
48+
runs-on: ubuntu-latest
4949
steps:
5050
- name: Checkout azure-javaee-iaas
5151
uses: actions/checkout@v2

weblogic-azure-aks/src/main/arm/scripts/common.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export constAdminT3AddressEnvName="T3_TUNNELING_ADMIN_ADDRESS"
99
export constAdminServerName='admin-server'
1010
export constClusterName='cluster-1'
1111
export constClusterT3AddressEnvName="T3_TUNNELING_CLUSTER_ADDRESS"
12+
export constDefaultJavaOptions="-Dlog4j2.formatMsgNoLookups=true -Dweblogic.StdoutDebugEnabled=false" # the java options will be applied to the cluster
1213
export constFalse="false"
1314
export constTrue="true"
1415

weblogic-azure-aks/src/main/arm/scripts/genDomainConfig.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ spec:
8888
- name: CUSTOM_DOMAIN_NAME
8989
value: "${wlsDomainName}"
9090
- name: JAVA_OPTIONS
91-
value: "-Dweblogic.StdoutDebugEnabled=false ${javaOptions}"
91+
value: "${constDefaultJavaOptions} ${javaOptions}"
9292
- name: USER_MEM_ARGS
9393
value: "-Djava.security.egd=file:/dev/./urandom -Xms256m -Xmx512m -XX:MinRAMPercentage=25.0 -XX:MaxRAMPercentage=50.0 "
9494
- name: MANAGED_SERVER_PREFIX

weblogic-azure-aks/src/main/arm/scripts/updateDomainConfig.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ while [ $index -lt ${envLength} ]; do
182182
index=$((index+1))
183183

184184
if [[ "${envItemName}" == "JAVA_OPTIONS" ]];then
185-
envItemValue="\"-Dweblogic.StdoutDebugEnabled=false ${javaOptions}\""
185+
envItemValue="\"${constDefaultJavaOptions} ${javaOptions}\""
186186
fi
187187

188188
# do not copy value from SSL_ env

weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/setupAdminDomain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,4 +589,4 @@ echo "Waiting for admin server to be available"
589589
wait_for_admin
590590
echo "Weblogic admin server is up and running"
591591

592-
disableRemoteAnonymousRequests
592+
disableRemoteAnonymousRequests

0 commit comments

Comments
 (0)