Script corrections

Author: rjeberhard

operator/src/main/resources/scripts/stop-server.py

@@ -24,13 +24,15 @@ def getEnvVar(var):
 domain_name = getEnvVar('DOMAIN_NAME')
 domain_path = getEnvVar('DOMAIN_HOME')
 service_name = getEnvVar('SERVICE_NAME')
-local_admin_port = getEnvVar('SHUTDOWN_PORT')
-local_admin_protocol = getEnvVar('SHUTDOWN_PROTOCOL')
-timeout = getEnvVar('SHUTDOWN_TIMEOUT')
-ignore_sessions = getEnvVar('SHUTDOWN_IGNORE_SESSIONS')
-shutdown_type = getEnvVar('SHUTDOWN_TYPE')
-
-force = (shutdown_type.lower() == 'forced')
+local_admin_port = getEnvVar('SHUTDOWN_PORT_ARG')
+local_admin_protocol = getEnvVar('SHUTDOWN_PROTOCOL_ARG')
+timeout = getEnvVar('SHUTDOWN_TIMEOUT_ARG')
+ignore_sessions = getEnvVar('SHUTDOWN_IGNORE_SESSIONS_ARG')
+shutdown_type = getEnvVar('SHUTDOWN_TYPE_ARG')
+
+force = 'false'
+if shutdown_type.lower() == 'forced':
+  force = 'true'
 
 connect_url = local_admin_protocol + '://' + service_name + ':' + local_admin_port
 

operator/src/main/resources/scripts/stopServer.sh

@@ -54,11 +54,11 @@ check_for_shutdown
 [ ! -f "${SCRIPTPATH}/wlst.sh" ] && trace "Error: missing file '${SCRIPTPATH}/wlst.sh'." && exit 1
 
 # Arguments for shutdown
-export SHUTDOWN_PORT=${LOCAL_ADMIN_PORT:-${MANAGED_SERVER_PORT:-8001}}
-export SHUTDOWN_PROTOCOL=${LOCAL_ADMIN_PROTOCOL:-t3}
-export SHUTDOWN_TIMEOUT=${SHUTDOWN_TIMEOUT:-30}
-export SHUTDOWN_IGNORE_SESSIONS=${SHUTDOWN_IGNORE_SESSIONS:-false}
-export SHUTDOWN_TYPE=${SHUTDOWN_TYPE:-Graceful}
+export SHUTDOWN_PORT_ARG=${LOCAL_ADMIN_PORT:-${MANAGED_SERVER_PORT:-8001}}
+export SHUTDOWN_PROTOCOL_ARG=${LOCAL_ADMIN_PROTOCOL:-t3}
+export SHUTDOWN_TIMEOUT_ARG=${SHUTDOWN_TIMEOUT:-30}
+export SHUTDOWN_IGNORE_SESSIONS_ARG=${SHUTDOWN_IGNORE_SESSIONS:-false}
+export SHUTDOWN_TYPE_ARG=${SHUTDOWN_TYPE:-Graceful}
 
 trace "Before stop-server.py [${SERVER_NAME}] ${SCRIPTDIR}" &>> /u01/oracle/stopserver.out
 ${SCRIPTPATH}/wlst.sh /weblogic-operator/scripts/stop-server.py &>> /u01/oracle/stopserver.out