Skip to content

- Remove long timeouts added for debugging. #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 17, 2023
Merged

- Remove long timeouts added for debugging. #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60d12ae
- Remove long timeouts added for debugging.
rlubke Aug 17, 2023
45095c5
- Remove long timeouts added for debugging.
rlubke Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/docker-utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function coh_up() {
while [ ${SECONDS} -le 60 ]; do
READY=$(curl -o /dev/null -s -w "%{http_code}" "http://127.0.0.1:6676/ready") || true
if [ "${READY}" -eq "200" ]; then
sleep 20
sleep 5
echo "Coherence is ready!"
return
fi
Expand Down
9 changes: 8 additions & 1 deletion bin/keys.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ if [ -z "${CERTS_DIR}" ] ; then
exit 1
fi

# check for location of openssl.cnf
if [ -f "/etc/ssl/openssl.cnf" ]; then
export SSL_CNF=/etc/ssl/openssl.cnf
else
export SSL_CNF=/etc/pki/tls/openssl.cnf
fi

mkdir -p "${CERTS_DIR}"

# Generate random passwords for each run
Expand All @@ -31,7 +38,7 @@ echo "${CAPASS}" | openssl genrsa -passout stdin -aes256 \
echo Generate Guardians CA certificate:
echo "${CAPASS}" | openssl req -passin stdin -new -x509 -days 3650 \
-reqexts SAN \
-config <(cat /etc/ssl/openssl.cnf \
-config <(cat "${SSL_CNF}" \
<(printf "\n[SAN]\nsubjectAltName=DNS:localhost,DNS:127.0.0.1")) \
-key "${CERTS_DIR}"/guardians-ca.key \
-out "${CERTS_DIR}"/guardians-ca.crt \
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"repository": "https://github.com/oracle/coherence-js-client",
"dependencies": {
"@grpc/proto-loader": "^0.7",
"@grpc/grpc-js": "^1.8",
"@grpc/grpc-js": "^1.9",
"google-protobuf": "^3.21",
"decimal.js": "^10.4"
},
Expand Down