-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactors logging to use annonation style
- Loading branch information
Showing
8 changed files
with
138 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| #!/usr/bin/env bash | ||
| # Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # args: <trace|log> <-c|-eu -o pipefail -c> | ||
|
|
||
| ACTION="$1" | ||
| if [ "$ACTION" = "trace" ]; then | ||
| >&2 echo "Shell trace: $@" | ||
| fi | ||
|
|
||
| # remove action and shellflags up to the -c | ||
| for var; do | ||
| shift | ||
| [ "$var" = '-c' ] && break; | ||
| done | ||
|
|
||
| if [ -z "${LOGGING_TARGET:-}" ] || [ "$ACTION" = "trace" ]; then | ||
| eval "$@" | ||
| exit $? | ||
| fi | ||
|
|
||
| # in case of recursive make calls, unset the TARGET env var to avoid | ||
| # logging in the child call when not desired | ||
| TARGET=$LOGGING_TARGET | ||
| unset LOGGING_TARGET | ||
|
|
||
| set -o errexit | ||
| set -o nounset | ||
| set -o pipefail | ||
|
|
||
| SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)" | ||
| source "${SCRIPT_ROOT}/common.sh" | ||
|
|
||
| DATE=$(build::find::gnu_variant_on_mac date) | ||
| DATE_NANO=$(if [ "$(uname -s)" = "Linux" ] || [ "$DATE" = "gdate" ]; then echo %3N; fi) | ||
|
|
||
| START_TIME=$($DATE +%s.$DATE_NANO) | ||
|
|
||
| echo -e "\n------------------- $($DATE +"%Y-%m-%dT%H:%M:%S.$DATE_NANO%z") Starting target=$TARGET -------------------" | ||
| echo "($(pwd)) \$ $@" | ||
| eval "$@" | ||
| echo -e "------------------- $($DATE +"%Y-%m-%dT%H:%M:%S.$DATE_NANO%z") Finished target=$TARGET duration=$(echo $($DATE +%s.$DATE_NANO) - $START_TIME | bc) seconds -------------------\n" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.