check if netdata is really started; fixes #3321
Costa Tsaousis (ktsaou) committed
Jan 20, 2018 at 17:43 UTC
67d4998cca7ee3015ba90f0e2c1d35fd05d92f9c
1 file changed
+22
-2
installer/functions.sh
+22
-2
@@ -592,7 +592,7 @@ stop_netdata_on_pid() {
592
return 0
593
}
594
595
-stop_all_netdata() {
595
+netdata_pids() {
596
local p myns ns
597
598
myns="$(readlink /proc/self/ns/pid 2>/dev/null)"
@@ -608,11 +608,19 @@ stop_all_netdata() {
608
609
if [ -z "${myns}" -o -z "${ns}" -o "${myns}" = "${ns}" ]
610
then
611
- stop_netdata_on_pid ${p}
611
+ pidisnetdata ${p} && echo "${p}"
612
fi
613
done
614
}
615
616
+stop_all_netdata() {
617
+ local p
618
+ for p in $(netdata_pids)
619
+ do
620
+ stop_netdata_on_pid ${p}
621
+ done
622
+}
623
+
624
# -----------------------------------------------------------------------------
625
# restart netdata
626
@@ -630,12 +638,24 @@ restart_netdata() {
638
stop_all_netdata
639
service netdata restart && started=1
640
641
+ if [ ${started} -eq 1 -a -z "$(netdata_pids)" ]
642
+ then
643
+ echo >&2 "Ooops! it seems netdata is not started."
644
+ started=0
645
+ fi
646
+
647
if [ ${started} -eq 0 ]
648
then
649
service netdata start && started=1
650
fi
651
fi
652
653
+ if [ ${started} -eq 1 -a -z "$(netdata_pids)" ]
654
+ then
655
+ echo >&2 "Hm... it seems netdata is still not started."
656
+ started=0
657
+ fi
658
+
659
if [ ${started} -eq 0 ]
660
then
661
# still not started...