made it handle different directories for saving JSON files
box@home root committed
Jun 18, 2013 at 23:58 UTC
d9f1940e35a345051b10fafc1465c2008e224020
1 file changed
+29
-8
netdata.start
+29
-8
@@ -9,10 +9,31 @@ then
9
fi
10
cd "$base" || exit 1
11
12
-echo "Creating a directory for netdata in /run"
13
-if [ ! -d /run/netdata ]
12
+echo "Creating a directory for netdata..."
13
+data=
14
+for x in /run/netdata /var/run/netdata /tmp/netdata
15
+do
16
+ echo " Trying '${x}'..."
17
+ if [ ! -d "${x}" ]
18
+ then
19
+ mkdir "${x}"
20
+ if [ $? -eq 0 ]
21
+ then
22
+ echo " OK. '${x}' works."
23
+ data="${x}"
24
+ break
25
+ fi
26
+ else
27
+ echo " OK. '${x}' works."
28
+ data="${x}"
29
+ break
30
+ fi
31
+done
32
+
33
+if [ -z "${data}" ]
34
then
15
- mkdir /run/netdata || exit 1
35
+ echo >&2 "Cannot find where to put JSON files."
36
+ exit 1
37
fi
38
39
echo "Stopping a (possibly) running netdata..."
@@ -22,7 +43,7 @@ echo "Compiling netdata"
43
gcc -O3 -o netdata netdata.c || exit 1
44
45
echo "Starting netdata"
25
-./netdata -d -u 1 -l 60 -o /run/netdata || exit 1
46
+./netdata -d -u 1 -l 60 -o "${data}" || exit 1
47
48
echo "Waiting 2 seconds for the JSON files"
49
# wait 2 seconds for the JSON files to be generated
@@ -36,10 +57,10 @@ fi
57
58
if [ ! -d data ]
59
then
39
- echo "Linking /run/netdata to $base/data"
40
- ln -s /run/netdata data || exit 1
60
+ echo "Linking '${data}' to $base/data"
61
+ ln -s "${data}" data || exit 1
62
else
42
- echo >&2 "Directory $base/data already exists. Not touching it, however it should be a link /run/netdata."
63
+ echo >&2 "Directory $base/data already exists. Not touching it, however it should be a link '${data}'."
64
fi
65
66
echo "Generating all.html"
@@ -75,7 +96,7 @@ cat >all.html <<EOF
96
// EDIT: --------------------------------------------------------------------------------
97
EOF
98
78
-all=`ls /run/netdata | grep .json$ | sed "s/\.json$//g"`
99
+all=`ls "${data}" | grep .json$ | sed "s/\.json$//g"`
100
for x in $all
101
do
102
cat >>all.html <<EOF2