From: Nicolas Boisselier Date: Mon, 11 Mar 2019 00:01:09 +0000 (+0000) Subject: bin/nb-update X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=08100c50ef014c4f438bf91be5819afc32233ff2;p=nb.git bin/nb-update --- diff --git a/bin/nb-update b/bin/nb-update index fa7abc5b..092671bd 100755 --- a/bin/nb-update +++ b/bin/nb-update @@ -114,7 +114,9 @@ for repo in $(nb_repos); do fi + #echo nb_api_post_host_info "${NAME}.$repo.name" "$name" echo + echo " >Post repo infos" ( nb_api_post_host_info "${NAME}.$repo.name" "$name" nb_api_post_host_info "${NAME}.$repo.path" "$repo" @@ -126,7 +128,8 @@ for repo in $(nb_repos); do # NB 06.02.18 key="repo.$name.$branch" # NB 06.02.18 nb_api_post_host_info "${key}.path" "$repo" # NB 06.02.18 nb_api_post_host_info "${key}.exit_code" "$ex" - ) 2>/dev/null + echo + ) 2>/dev/null | sed -E -e 's/^(.)/ POST \1/; s/'$'\t''/: /' done @@ -137,7 +140,7 @@ rm -f /tmp/$NAME.infos /tmp/$NAME.check /run/$NAME-nb_post_sys_infos.lock find /run/$NAME-nb_api_post_sys_infos.lock -mmin +60 -exec rm {} \; >/dev/null 2>&1 if [ ! -e /run/$NAME-nb_api_post_sys_infos.lock ]; then touch /run/$NAME-nb_api_post_sys_infos.lock - echo "Post local infos" + echo ">Post sys infos" nb_api_post_hosts_infos | sed -e 's/^/ /; s/'$'\t''/: /' fi diff --git a/etc/profile.d/nb.sh b/etc/profile.d/nb.sh index 94218aa0..1191ca68 100644 --- a/etc/profile.d/nb.sh +++ b/etc/profile.d/nb.sh @@ -112,7 +112,10 @@ nb_api_post_host_info() { [ $# = 0 ] && echo "Usage: nb_api_post_host_info key=? val=?" 1>&2 && return 1 local host=$(hostname) [ -z "$host" ] && host=$(hostname -f) - nb_api_table_post host_info "host=$host" "key=$1" "val=${i[*]:1}" + local key="$1" + local val="$2" + echo "key=$key val=$val" + nb_api_table_post host_info "host=$host" "key=$key" "val=$val" > /dev/null } nb_api_post_hosts_infos() {