Skip to content

Commit 362191e

Browse files
authored
Refactor debug logging for EC2_IF_INITIAL_SETUP
Addressed review: applied the same fix as in #144’s intent everywhere [ -v EC2_IF_INITIAL_SETUP ] && debug appears in lib/lib.sh (get_meta, maybe_reload_networkd else branch, and the EXIT trap in register_networkd_reloader) so none of these return non-zero when the variable is unset under set -e.
1 parent e576ebe commit 362191e

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

lib/lib.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ get_meta() {
140140
local key=$1
141141
local max_tries=${2:-10}
142142
declare -i attempts=0
143-
[ -v EC2_IF_INITIAL_SETUP ] && debug "[get_meta] Querying IMDS for ${key}"
143+
if [ -v EC2_IF_INITIAL_SETUP ]; then
144+
debug "[get_meta] Querying IMDS for ${key}"
145+
fi
144146

145147
if [[ -z $imds_endpoint || -z $imds_token || -z $imds_interface ]]; then
146148
error "[get_meta] Unable to obtain IMDS token, endpoint, or interface"
@@ -640,7 +642,7 @@ register_networkd_reloader() {
640642
while [ $cnt -lt $max ]; do
641643
cnt+=1
642644
mkdir -p "$lockdir"
643-
trap '[ -v EC2_IF_INITIAL_SETUP ] && debug "Called trap" ; maybe_reload_networkd' EXIT
645+
trap 'if [ -v EC2_IF_INITIAL_SETUP ]; then debug "Called trap"; fi; maybe_reload_networkd' EXIT
644646
# If the redirect fails, most likely because the target file
645647
# already exists and -o noclobber is in effect, $? will be set
646648
# nonzero. If it succeeds, it is set to 0

0 commit comments

Comments
 (0)