X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=usttrace;h=af80faf76afd3adf7eae740e8f75bc5a910e5abd;hb=618f74d9b64410da1c0684c040787198dec03161;hp=54266db2cf432bcbaa1b8feef466e0c965d834cc;hpb=ec0647137dec0214d6a914b13fb053fe3ac2eb4e;p=ust.git diff --git a/usttrace b/usttrace index 54266db..af80faf 100755 --- a/usttrace +++ b/usttrace @@ -13,7 +13,7 @@ sighandler() { UST_CONSUMERD_PID=`cat $pidfilepath` fi # Tell the daemon to die - kill -SIGTERM "${UST_CONSUMERD_PID}" + kill -TERM "${UST_CONSUMERD_PID}" echo "Waiting for ust-consumerd to shutdown..." wait "${UST_CONSUMERD_PID}" @@ -123,7 +123,7 @@ UST_CONSUMERD_SOCKPATH="/tmp/ust-consumerd-sock-$$" if [ "$arg_syswide_daemon" != "1" ]; then pidfilepath="/tmp/usttrace-$USER-$(date +%Y%m%d%H%M%S%N)-ust-consumerd-pid" - trap "sighandler $pidfilepath" SIGINT + trap "sighandler $pidfilepath" INT mkfifo -m 0600 "$pidfilepath" # Start daemon ${UST_CONSUMERD} --pidfile "$pidfilepath" -s "${UST_CONSUMERD_SOCKPATH}" -o "$OUTDIR" >"$OUTDIR/ust-consumerd.log" 2>&1 & @@ -206,7 +206,7 @@ fi if [ "$arg_syswide_daemon" != "1" ]; then # Tell the daemon to die - kill -SIGTERM "${UST_CONSUMERD_PID}" + kill -TERM "${UST_CONSUMERD_PID}" echo "Waiting for ust-consumerd to shutdown..." wait "${UST_CONSUMERD_PID}"