diff options
author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-04-29 15:12:00 +0200 |
---|---|---|
committer | Jean-Marie Henaff <jmhenaff@google.com> | 2015-04-29 16:16:32 +0200 |
commit | 29236346c422d87a9514edaebd3029e32485811c (patch) | |
tree | 05696e9a0a1e55282e3dd7ef3327218063fb99a6 /jack | |
parent | 2f4937b1e507a63eae229aca27054db2c44e6c21 (diff) | |
download | toolchain_jack-29236346c422d87a9514edaebd3029e32485811c.zip toolchain_jack-29236346c422d87a9514edaebd3029e32485811c.tar.gz toolchain_jack-29236346c422d87a9514edaebd3029e32485811c.tar.bz2 |
Make error reporting in Jack script easily parsable
Bug: 20679295
Change-Id: If5c1b72a6a29f8c5034d60658348208538ead406
Diffstat (limited to 'jack')
-rwxr-xr-x | jack/etc/jack | 12 | ||||
-rwxr-xr-x | jack/etc/jack-admin | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/jack/etc/jack b/jack/etc/jack index 51e0c19..3f823e4 100755 --- a/jack/etc/jack +++ b/jack/etc/jack @@ -59,7 +59,7 @@ fi # if [ "$SERVER" != "true" ]; then exec $JACK_VM_COMMAND -cp $JACK_JAR com.android.jack.Main "$@" - echo "Cannot succeed to launch Jack" >&2 + echo "ERROR: Cannot succeed to launch Jack without Jack server" >&2 exit 255 fi @@ -135,7 +135,7 @@ while true; do # Failed to connect if [ $(date +%s) -ge $DATE_CONNECT ]; then if [ $RETRY_LAUNCH -eq 0 ]; then - echo "Cannot launch background server" >&2 + echo "ERROR: Cannot launch Jack server" >&2 abort else let RETRY_LAUNCH=RETRY_LAUNCH-1 @@ -153,21 +153,21 @@ while true; do # Http code not OK, let's decode and abort if [ $HTTP_CODE -eq 401 ]; then # 401: Unauthorized - echo "Security problem, see server log ($SERVER_LOG)" >&2 + echo "ERROR: Security problem, see Jack server log ($SERVER_LOG)" >&2 abort elif [ $HTTP_CODE -eq 400 ]; then # 400: Bad request - echo "Bad request, see server log ($SERVER_LOG)" >&2 + echo "ERROR: Bad request, see Jack server log ($SERVER_LOG)" >&2 abort else # Other - echo "Internal unknown error ($HTTP_CODE), try other ports in ~/.jack, or see server log ($SERVER_LOG)" >&2 + echo "ERROR: Internal unknown error ($HTTP_CODE), try other ports in ~/.jack, or see Jack server log ($SERVER_LOG)" >&2 abort fi else # In case of partial, timeout, empty respond, network error, let's retry if [ $RETRY_SESSION -eq 0 ]; then - echo "Communication error with server ($CURL_CODE)" >&2 + echo "ERROR: Communication error with Jack server ($CURL_CODE)" >&2 abort else let RETRY_SESSION=RETRY_SESSION-1 diff --git a/jack/etc/jack-admin b/jack/etc/jack-admin index d428b53..d255990 100755 --- a/jack/etc/jack-admin +++ b/jack/etc/jack-admin @@ -84,7 +84,7 @@ case $1 in echo "Killing background server" kill $(ps aux | grep JackSimpleServer | grep -v grep | awk '{print $2}') 2>/dev/null if [ $? -ne 0 ]; then - echo "No server to kill" >&2 + echo "ERROR: No Jack server to kill" >&2 exit 2 else exit 0 @@ -94,7 +94,7 @@ case $1 in exit $? ;; start-server) SERVER_PRG="$JACK_VM_COMMAND -cp $JACK_JAR com.android.jack.server.JackSimpleServer" - echo "Launching background server" $SERVER_PRG + echo "Launching Jack server" $SERVER_PRG $SERVER_PRG $SERVER_PORT_SERVICE $SERVER_PORT_ADMIN $SERVER_COUNT $SERVER_NB_COMPILE $SERVER_TIMEOUT >>$SERVER_LOG 2>&1 & exit 0 ;; *) @@ -128,7 +128,7 @@ while true; do elif [ $CURL_CODE -eq 7 ]; then # Failed to connect if [ $(date +%s) -ge $DATE_CONNECT ]; then - echo "No Jack server running" + echo "ERROR: No Jack server running" exit 255 else sleep 0.2 2>/dev/null @@ -139,21 +139,21 @@ while true; do # Http code not OK, let's decode and abort if [ $HTTP_CODE -eq 401 ]; then # 401: Unauthorized - echo "Security problem, see server log" >&2 + echo "ERROR: Security problem, see Jack server log" >&2 exit 255 elif [ $HTTP_CODE -eq 400 ]; then # 400: Bad request - echo "Bad request, see server log" >&2 + echo "ERROR: Bad request, see Jack server log" >&2 exit 255 else # Other - echo "Internal unknown error ($HTTP_CODE), try other ports in ~/.jack, or see server log" >&2 + echo "ERROR: Internal unknown error ($HTTP_CODE), try other ports in ~/.jack, or see Jack server log" >&2 exit 255 fi else # In case of partial, timeout, empty respond, network error, let's retry if [ $RETRY_SESSION -eq 0 ]; then - echo "Communication error with server ($CURL_CODE)" >&2 + echo "ERROR: Communication error with Jack server ($CURL_CODE)" >&2 exit 255 else let RETRY_SESSION=RETRY_SESSION-1 |