@cryptotaxi247 / netdata-1 / commits / 03d6b60ba

run with nice 19 and use all available processors when compiling

Costa Tsaousis (ktsaou) committed Oct 16, 2016 at 16:55 UTC 03d6b60ba532ffa91756045a5548af49d93dcccc
1 file changed +21 -15
netdata-installer.sh
+21 -15
@@ -15,6 +15,12 @@ fi
15 LC_ALL=C
16 umask 022
17
18 +# Be nice on production environments
19 +renice 19 $$ >/dev/null 2>/dev/null
20 +
21 +processors=$(cat /proc/cpuinfo | grep ^processor | wc -l)
22 +[ $(( processors )) -lt 1 ] && processors=1
23 +
24 # you can set CFLAGS before running installer
25 CFLAGS="${CFLAGS--O3}"
26
@@ -427,7 +433,7 @@ if [ -f src/netdata ]
433 fi
434
435 echo >&2 "Compiling netdata ..."
430 -run make || exit 1
436 +run make -j${processors} || exit 1
437
438 if [ "${BASH_VERSINFO[0]}" -ge "4" ]
439 then
@@ -713,35 +719,35 @@ isnetdata() {
719 }
720
721 stop_netdata_on_pid() {
716 - local pid="$1" ret=0 count=0
722 + local pid="${1}" ret=0 count=0
723
718 - isnetdata $pid || return 0
724 + isnetdata ${pid} || return 0
725
720 - printf >&2 "Stopping netdata on pid $pid ..."
721 - while [ ! -z "$pid" -a $ret -eq 0 ]
726 + printf >&2 "Stopping netdata on pid ${pid} ..."
727 + while [ ! -z "$pid" -a ${ret} -eq 0 ]
728 do
723 - if [ $count -gt 45 ]
729 + if [ ${count} -gt 45 ]
730 then
725 - echo >&2 "Cannot stop the running netdata on pid $pid."
731 + echo >&2 "Cannot stop the running netdata on pid ${pid}."
732 return 1
733 fi
734
735 count=$(( count + 1 ))
736
731 - run kill $pid 2>/dev/null
737 + run kill ${pid} 2>/dev/null
738 ret=$?
739
734 - test $ret -eq 0 && printf >&2 "." && sleep 2
740 + test ${ret} -eq 0 && printf >&2 "." && sleep 2
741 done
742
743 echo >&2
738 - if [ $ret -eq 0 ]
744 + if [ ${ret} -eq 0 ]
745 then
740 - echo >&2 "SORRY! CANNOT STOP netdata ON PID $pid !"
746 + echo >&2 "SORRY! CANNOT STOP netdata ON PID ${pid} !"
747 return 1
748 fi
749
744 - echo >&2 "netdata on pid $pid stopped."
750 + echo >&2 "netdata on pid ${pid} stopped."
751 return 0
752 }
753
@@ -755,7 +761,7 @@ stop_all_netdata() {
761 $(cat /var/run/netdata/netdata.pid 2>/dev/null) \
762 $(pidof netdata 2>/dev/null)
763 do
758 - stop_netdata_on_pid $p
764 + stop_netdata_on_pid ${p}
765 done
766 }
767
@@ -854,13 +860,13 @@ if [ ! -s "${NETDATA_PREFIX}/etc/netdata/netdata.conf" ]
860 ret=$?
861
862 # try curl
857 - if [ $ret -ne 0 -o ! -s "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" ]
863 + if [ ${ret} -ne 0 -o ! -s "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" ]
864 then
865 curl -s -o "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" "http://localhost:${NETDATA_PORT}/netdata.conf"
866 ret=$?
867 fi
868
863 - if [ $ret -eq 0 -a -s "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" ]
869 + if [ ${ret} -eq 0 -a -s "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" ]
870 then
871 mv "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" "${NETDATA_PREFIX}/etc/netdata/netdata.conf"
872 echo >&2 "New configuration saved for you to edit at ${NETDATA_PREFIX}/etc/netdata/netdata.conf"