Skip to content

Commit

Permalink
Zowe Suite v2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zowe-robot authored Mar 2, 2023
2 parents 5b69140 + 2329342 commit 54fb419
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 176 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to the Zlux App Server package will be documented in this file.

## v2.7.0

- Bugfix: Explicitly prefer ipv4 dns results to be compatible with node 18 since it switched to prefer ipv6 without configuration. This behavior can be cusomized via components.app-server.dns.lookupOrder='ipv4' or 'ipv6'. It defaults to 'ipv4'.

## v2.4.0

- Bugfix: Plugin register/deregister would not consider app2app actions and recgonizers. Now, they are added on registration and removed on deregistration.
Expand Down
28 changes: 26 additions & 2 deletions bin/app-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,34 @@ else
ZLUX_SERVER_FILE=zluxServer.js
fi

# Tells node whether to prefer ipv4 or ipv6 results to DNS lookups
ZLUX_DNS_ORDER="--dns-result-order=ipv4first"
if [ "$ZWE_components_app_server_dns_lookupOrder" = "ipv6" ]; then
ZLUX_DNS_ORDER="--dns-result-order=verbatim"
fi

# not all versions of node support the above (14.18+ generally) so we can just try it to see what happens.
v4_check=$(${NODE_BIN} ${ZLUX_DNS_ORDER} -e "console.log('success');")
if [ "${v4_check}" != "success" ]; then
ZLUX_DNS_ORDER=
fi

if [ -z "$ZLUX_NO_LOGFILE" ]; then
__UNTAGGED_READ_MODE=V6 _BPX_JOBNAME=${ZOWE_PREFIX}DS ${NODE_BIN} --harmony ${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} --config="${CONFIG_FILE}" "$@" 2>&1 | tee $ZWED_NODE_LOG_FILE
__UNTAGGED_READ_MODE=V6 \
_BPX_JOBNAME=${ZOWE_PREFIX}DS \
${NODE_BIN} \
--harmony \
${ZLUX_DNS_ORDER} \
${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} \
--config="${CONFIG_FILE}" "$@" 2>&1 | tee $ZWED_NODE_LOG_FILE
else
__UNTAGGED_READ_MODE=V6 _BPX_JOBNAME=${ZOWE_PREFIX}DS ${NODE_BIN} --harmony ${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} --config="${CONFIG_FILE}" "$@"
__UNTAGGED_READ_MODE=V6 \
_BPX_JOBNAME=${ZOWE_PREFIX}DS \
${NODE_BIN} \
--harmony \
${ZLUX_DNS_ORDER} \
${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} \
--config="${CONFIG_FILE}" "$@"
echo "Ended with rc=$?"
fi

Expand Down
174 changes: 0 additions & 174 deletions bin/zssServer.sh

This file was deleted.

12 changes: 12 additions & 0 deletions schemas/app-server-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,18 @@
"privilegedServerName": {
"type": "string",
"description": "The nickname of the ZIS server to be used"
},
"dns": {
"type": "object",
"description": "Parameters used to customize DNS query behavior",
"properties": {
"lookupOrder": {
"type": "string",
"enum": [ "ipv4", "ipv6" ],
"default": "ipv4",
"description": "Used to specify to nodejs whether DNS lookups should return ipv4 or ipv6 IPs"
}
}
}
},
"$defs": {
Expand Down

0 comments on commit 54fb419

Please sign in to comment.