minor fixes
Costa Tsaousis (ktsaou) committed
May 1, 2014 at 04:57 UTC
b4c8626640dfd7dacba7777becfb3c455b1e0323
4 files changed
+18
-29
netdata.c
+8
-26
@@ -689,36 +689,16 @@ static void strreverse(char* begin, char* end)
689
aux = *end, *end-- = *begin, *begin++ = aux;
690
}
691
692
-// fast number to string
693
-// returns length of string
694
-int itoa(int32_t value, char *str)
695
-{
696
- char *wstr = str;
697
-
698
- // Take care of sign
699
- unsigned int uvalue = (value < 0) ? -value : value;
700
-
701
- // Conversion. Number is reversed.
702
- do *wstr++ = (char)(48 + (uvalue % 10)); while(uvalue /= 10);
703
- if (value < 0) *wstr++ = '-';
704
- *wstr='\0';
705
-
706
- // Reverse string
707
- strreverse(str,wstr-1);
708
-
709
- return(wstr - str);
710
-}
711
-
692
693
// ----------------------------------------------------------------------------
694
// RRD STATS
695
696
#define RRD_STATS_NAME_MAX 1024
697
718
-typedef long double calculated_number;
719
-#define CALCULATED_NUMBER_FORMAT "%0.1Lf"
720
-//typedef long long calculated_number;
721
-//#define CALCULATED_NUMBER_FORMAT "%lld"
698
+//typedef long double calculated_number;
699
+//#define CALCULATED_NUMBER_FORMAT "%0.1Lf"
700
+typedef long long calculated_number;
701
+#define CALCULATED_NUMBER_FORMAT "%lld"
702
703
typedef long long collected_number;
704
#define COLLECTED_NUMBER_FORMAT "%lld"
@@ -5538,15 +5518,17 @@ int main(int argc, char **argv)
5518
else if(strcmp(argv[i], "-dl") == 0 && (i+1) < argc) { config_set("debug", "log", argv[i+1]); i++; }
5519
else if(strcmp(argv[i], "-df") == 0 && (i+1) < argc) { config_set("debug", "flags", argv[i+1]); i++; }
5520
else if(strcmp(argv[i], "-d") == 0) { config_set_number("global", "daemon", 1); }
5521
+ else if(strcmp(argv[i], "-nd") == 0) { config_set_number("global", "daemon", 0); }
5522
else if(strcmp(argv[i], "-p") == 0 && (i+1) < argc) { config_set("global", "port", argv[i+1]); i++; }
5542
- else if(strcmp(argv[i], "-u") == 0 && (i+1) < argc) { config_set("global", "user", argv[i+1]); i++; }
5523
+ else if(strcmp(argv[i], "-u") == 0 && (i+1) < argc) { config_set("global", "run as user", argv[i+1]); i++; }
5524
else if(strcmp(argv[i], "-l") == 0 && (i+1) < argc) { config_set("global", "history", argv[i+1]); i++; }
5525
else if(strcmp(argv[i], "-t") == 0 && (i+1) < argc) { config_set("global", "update_every", argv[i+1]); i++; }
5526
else {
5527
fprintf(stderr, "Cannot understand option '%s'.\n", argv[i]);
5528
fprintf(stderr, "\nUSAGE: %s [-d] [-l LINES_TO_SAVE] [-u UPDATE_TIMER] [-p LISTEN_PORT] [-dl debug log file] [-df debug flags].\n\n", argv[0]);
5529
fprintf(stderr, " -c CONFIG FILE the configuration file to load. Default: %s.\n", CONFIG_FILENAME);
5549
- fprintf(stderr, " -d enable daemon mode (run in background).\n");
5530
+ fprintf(stderr, " -d enable daemon mode (run in the background).\n");
5531
+ fprintf(stderr, " -nd disable daemon mode (do not run in the background).\n");
5532
fprintf(stderr, " -l LINES_TO_SAVE can be from 5 to %d lines in JSON data. Default: %d.\n", HISTORY_MAX, HISTORY);
5533
fprintf(stderr, " -t UPDATE_TIMER can be from 1 to %d seconds. Default: %d.\n", UPDATE_EVERY_MAX, UPDATE_EVERY);
5534
fprintf(stderr, " -p LISTEN_PORT can be from 1 to %d. Default: %d.\n", 65535, LISTEN_PORT);
netdata.start
+10
-3
@@ -45,6 +45,9 @@ then
45
else
46
NETDATA_CONFIG_DEBUG=1
47
fi
48
+
49
+ # find the user to run as
50
+ NETDATA_CONFIG_USER="`grep 'run as user = ' netdata.conf | head -n 1 | cut -d '=' -f 2 | sed s"/ //g"`"
51
fi
52
fi
53
@@ -64,6 +67,13 @@ killall netdata 2>/dev/null
67
killall tc-all.sh 2>/dev/null
68
sleep 2
69
70
+if [ "$USER" = "root" -a ! -z "$NETDATA_CONFIG_USER" ]
71
+then
72
+ chown -R "$NETDATA_CONFIG_USER" web || exit 1
73
+ chmod 0775 web || exit 1
74
+ chmod -R 0664 web/* || exit 1
75
+fi
76
+
77
echo "Starting netdata..."
78
if [ -f netdata.conf ]
79
then
@@ -73,9 +83,6 @@ else
83
84
if [ "$USER" = "root" ]
85
then
76
- chown -R "$NETDATA_CONFIG_USER" web || exit 1
77
- chmod 0775 web || exit 1
78
- chmod -R 0664 web/* || exit 1
86
`pwd`/netdata $debug_opts -d -u $NETDATA_CONFIG_USER -t $NETDATA_CONFIG_INTERNAL_UPDATE_EVERY -l $NETDATA_CONFIG_INTERNAL_HISTORY_LINES -p $NETDATA_CONFIG_PORT || exit 1
87
else
88
echo >&2 "WARNING: NOT RUNNING AS ROOT - CANNOT SWITCH TO USER $NETDATA_CONFIG_USER"