From: Nicolas Boisselier Date: Tue, 12 Dec 2017 21:31:25 +0000 (+0000) Subject: etc/profile.d/nb.sh X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=519be0ca0599d90356d8a187c72bc62abd87bf04;p=nb.git etc/profile.d/nb.sh --- diff --git a/bin/nb-update b/bin/nb-update index 4fe2ef18..92bcbc68 100755 --- a/bin/nb-update +++ b/bin/nb-update @@ -87,8 +87,8 @@ for repo in $(nb_repos); do fi echo - nb_api_insert host_info key=repo.$name.exit_code val=$ex - nb_api_insert host_info key=repo.$name.last_commit val=$(cd "$repo" && git log | head -1 | awk '/^commit/ { print $2; exit; }') + nb_api_post host_info key=repo.$name.exit_code val=$ex + nb_api_post host_info key=repo.$name.last_commit val=$(cd "$repo" && git log | head -1 | awk '/^commit/ { print $2; exit; }') done @@ -99,7 +99,7 @@ rm -f /tmp/$NAME.infos find /tmp/$NAME.check -mmin +60 -exec rm {} \; > /dev/null 2>&1 if [ ! -e /tmp/$NAME.check ]; then touch /tmp/$NAME.check - nb_api_insert_sys_infos + nb_post_sys_infos fi ##################################################################### diff --git a/etc/profile.d/nb.sh b/etc/profile.d/nb.sh index 64800ce6..67da5cda 100644 --- a/etc/profile.d/nb.sh +++ b/etc/profile.d/nb.sh @@ -72,14 +72,14 @@ nb_perl() { ruby -r$NB_ROOT/lib/perl/NB -e "$@" } -nb_api_insert() { - local usage="Usage: nb_api_insert TABLE field1=val1 field2=val2 ..." +nb_api_post() { + local usage="Usage: nb_api_post TABLE field1=val1 field2=val2 ..." local table="${1:?$usage}"; shift local host=$(hostname) [ -z "$host" ] && host=$(hostname -f) - local curl="curl -su nb:0TXARcQUpjHZctoROA2X.weWSZKM5DGT -H 'Accept: application/x-sh' https://api.nbdom.net/data/$table/insert -d host=$host" + local curl="curl -su nb:0TXARcQUpjHZctoROA2X.weWSZKM5DGT -H 'Accept: application/x-sh' https://api.nbdom.net/data/$table/replace -d host=$host" while [ "$#" -gt "0" ]; do curl="$curl -d \"$1\"" @@ -90,12 +90,12 @@ nb_api_insert() { ) > /dev/null } -nb_api_insert_sys_infos() { +nb_post_sys_infos() { ( sys_infos | while IFS=$'\t' read -r -a i; do - #eval "nb_api_insert host_info \"key=${i[0]}\" \"val=${i[1]}\"" - nb_api_insert host_info "key=${i[0]}" "val=${i[1]}" + #eval "nb_api_post host_info \"key=${i[0]}\" \"val=${i[1]}\"" + nb_api_post host_info "key=${i[0]}" "val=${i[1]}" done -) | sed 's/^/nb_api_insert_sys_infos: /' +) | sed 's/^/nb_post_sys_infos: /' }