commit 4b541e77beaf77912ba86067fd7ac8c3ba986572
author Benoit Lamarche <benoitlamarche@google.com> Tue Apr 21 22:02:56 2015 +0200
committer Benoit Lamarche <benoitlamarche@google.com> Tue Apr 21 23:16:57 2015 +0200
tree 18b16a8812ecb876dfaed39d82f3a817c330b80f
parent 4b65bd5575fdf9a836a34040aa830a279a5f9e87

Add temporary client log in Jack server log

Change-Id: I348f0285dca0cb392f3d0e87b56b42792555ccf2

tools/jack

diff --git a/tools/jack b/tools/jack
index cbee116..b26baff 100755
--- a/tools/jack
+++ b/tools/jack
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# v 1.1-a11
+# v 1.1-a11-log
 #
 set -o nounset
 umask 077
@@ -81,7 +81,7 @@
 mkdir "$SERVER_DIR" 2>/dev/null
 
 # Cleanup
-trap 'rm -f "$JACK_OUT" "$JACK_ERR" "$JACK_CLI" "$JACK_EXIT" 2>/dev/null; rmdir "$JACK_DIR" 2>/dev/null' EXIT
+trap 'rm -f "$JACK_OUT" "$JACK_ERR" "$JACK_CLI" "$JACK_EXIT" 2>>$SERVER_LOG; rmdir "$JACK_DIR" 2>>$SERVER_LOG' EXIT
 
 set -o errexit
 
@@ -92,7 +92,7 @@
 touch  "$JACK_CLI" "$JACK_EXIT"
 
 # Try to cleanup if interrupted
-abort () { kill -9 $PID_OUT $PID_ERR 2>/dev/null; wait $PID_OUT $PID_ERR 2>/dev/null; exit 255; }
+abort () { kill -9 $PID_OUT $PID_ERR 2>>$SERVER_LOG; wait $PID_OUT $PID_ERR 2>>$SERVER_LOG; exit 255; }
 trap 'abort' SIGHUP SIGINT SIGQUIT SIGTERM ERR
 
 # Redirect output and error
@@ -126,6 +126,7 @@
   HTTP_CODE=$(curl --fail --silent --data @- --output "$JACK_EXIT" --write-out %{http_code} --connect-timeout 10 --no-proxy 127.0.0.1:$SERVER_PORT_SERVICE http://127.0.0.1:$SERVER_PORT_SERVICE/jack <<< "+ $JACK_OUT $JACK_ERR $JACK_CLI")
   CURL_CODE=$?
   JACK_CODE=$(cat "$JACK_EXIT")
+  echo "CURL: $$ - $CURL_CODE - $HTTP_CODE - $JACK_CODE" >>$SERVER_LOG
   if [ $CURL_CODE -eq 0 ]; then
     # No problem, let's go
     break;