Skip to content
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

Jump to bottom

Add the debug option and verbose (foreground) #1949

Merged
merged 8 commits into from
Oct 8, 2021
Merged

Add the debug option and verbose (foreground) #1949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec0f282
Add the debug option and verbose (foreground)
folker-kuhn Oct 5, 2021
d4d7f18
Merge branch 'piranhacloud:current' into patch-1
folker-kuhn Oct 6, 2021
6e90576
Update start.sh
folker-kuhn Oct 6, 2021
aa36226
Update run.sh
folker-kuhn Oct 6, 2021
4df288f
Update start.sh
folker-kuhn Oct 6, 2021
e2bef20
Update server/src/main/zip/bin/run.sh
folker-kuhn Oct 7, 2021
b8dc758
Merge branch 'current' into patch-1
Thihup Oct 7, 2021
21fac25
Merge branch 'current' into patch-1
arjantijms Oct 8, 2021
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
22 changes: 1 addition & 21 deletions server/src/main/zip/bin/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,3 @@
#!/bin/bash

cd ..

if [ -z ${JAVA_HOME} ]; then
echo Using default java
JAVA_BIN=java
else
echo Using JAVA_HOME: ${JAVA_HOME}
JAVA_BIN=${JAVA_HOME}/bin/java
fi

if [[ "${PIRANHA_JPMS}" == "true" ]]; then
INIT_OPTIONS="--module-path lib -m cloud.piranha.server"
else
INIT_OPTIONS="-jar lib/piranha-server.jar"
fi

exec ${JAVA_BIN} ${JAVA_ARGS} -Djava.util.logging.config.file=etc/logging.properties ${INIT_OPTIONS} &

PID=$!
echo $PID >> tmp/piranha.pid
wait $PID
exec ./start.sh --run $*
30 changes: 26 additions & 4 deletions server/src/main/zip/bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cd ..

if [ -z ${JAVA_HOME} ]; then
echo Using default java
JAVA_BIN=java
JAVA_BIN=java
else
echo Using JAVA_HOME: ${JAVA_HOME}
JAVA_BIN=${JAVA_HOME}/bin/java
Expand All @@ -16,6 +16,12 @@ else
INIT_OPTIONS="-jar lib/piranha-server.jar"
fi


if [[ "$*" == *"--suspend"* ]]; then
JAVA_ARGS="${JAVA_ARGS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:9009"
fi


#
# Turn SSL on.
#
Expand All @@ -36,8 +42,24 @@ fi
#
# SSL_KEY_STORE_PASSWORD=-Djavax.net.ssl.keyStorePassword=password

${JAVA_BIN} ${JAVA_ARGS} ${SSL_DEBUG} ${SSL_KEY_STORE} ${SSL_KEY_STORE_PASSWORD} \
CMD="${JAVA_BIN} ${JAVA_ARGS} ${SSL_DEBUG} ${SSL_KEY_STORE} ${SSL_KEY_STORE_PASSWORD} \
-Djava.util.logging.config.file=etc/logging.properties \
${INIT_OPTIONS} ${SSL_ON} &
${INIT_OPTIONS} ${SSL_ON}"

echo $! >> tmp/piranha.pid
echo Starting Piranha using command: ${CMD}

touch tmp/piranha.pid

if [[ "$*" == *"--verbose"* ]]; then
${CMD}
else
if [[ "$*" == *"--run"* ]]; then
exec ${CMD} &
PID=$!
echo $PID >> tmp/piranha.pid
wait $PID
else
${CMD} &
echo $! >> tmp/piranha.pid
fi
fi