minor fixes

diff --git a/netdata.c b/netdata.c
old mode 100755 (executable)
new mode 100644 (file)
index c719a5f..39c10de
--- a/netdata.c
+++ b/netdata.c
@@ -689,36 +689,16 @@ static void strreverse(char* begin, char* end)
         aux = *end, *end-- = *begin, *begin++ = aux;
 }
 
-// fast number to string
-// returns length of string
-int itoa(int32_t value, char *str)
-{
-       char *wstr = str;
-
-       // Take care of sign
-       unsigned int uvalue = (value < 0) ? -value : value;
-
-       // Conversion. Number is reversed.
-       do *wstr++ = (char)(48 + (uvalue % 10)); while(uvalue /= 10);
-       if (value < 0) *wstr++ = '-';
-       *wstr='\0';
-
-       // Reverse string
-       strreverse(str,wstr-1);
-
-       return(wstr - str);
-}
-
 
 // ----------------------------------------------------------------------------
 // RRD STATS
 
 #define RRD_STATS_NAME_MAX 1024
 
-typedef long double calculated_number;
-#define CALCULATED_NUMBER_FORMAT "%0.1Lf"
-//typedef long long calculated_number;
-//#define CALCULATED_NUMBER_FORMAT "%lld"
+//typedef long double calculated_number;
+//#define CALCULATED_NUMBER_FORMAT "%0.1Lf"
+typedef long long calculated_number;
+#define CALCULATED_NUMBER_FORMAT "%lld"
 
 typedef long long collected_number;
 #define COLLECTED_NUMBER_FORMAT "%lld"
@@ -5538,15 +5518,17 @@ int main(int argc, char **argv)
                else if(strcmp(argv[i], "-dl") == 0 && (i+1) < argc) { config_set("debug",  "log",          argv[i+1]); i++; }
                else if(strcmp(argv[i], "-df") == 0 && (i+1) < argc) { config_set("debug",  "flags",        argv[i+1]); i++; }
                else if(strcmp(argv[i], "-d") == 0)                  { config_set_number("global", "daemon", 1); }
+               else if(strcmp(argv[i], "-nd") == 0)                 { config_set_number("global", "daemon", 0); }
                else if(strcmp(argv[i], "-p")  == 0 && (i+1) < argc) { config_set("global", "port",         argv[i+1]); i++; }
-               else if(strcmp(argv[i], "-u")  == 0 && (i+1) < argc) { config_set("global", "user",         argv[i+1]); i++; }
+               else if(strcmp(argv[i], "-u")  == 0 && (i+1) < argc) { config_set("global", "run as user",  argv[i+1]); i++; }
                else if(strcmp(argv[i], "-l")  == 0 && (i+1) < argc) { config_set("global", "history",      argv[i+1]); i++; }
                else if(strcmp(argv[i], "-t")  == 0 && (i+1) < argc) { config_set("global", "update_every", argv[i+1]); i++; }
                else {
                        fprintf(stderr, "Cannot understand option '%s'.\n", argv[i]);
                        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]);
                        fprintf(stderr, "  -c CONFIG FILE the configuration file to load. Default: %s.\n", CONFIG_FILENAME);
-                       fprintf(stderr, "  -d enable daemon mode (run in background).\n");
+                       fprintf(stderr, "  -d enable daemon mode (run in the background).\n");
+                       fprintf(stderr, "  -nd disable daemon mode (do not run in the background).\n");
                        fprintf(stderr, "  -l LINES_TO_SAVE can be from 5 to %d lines in JSON data. Default: %d.\n", HISTORY_MAX, HISTORY);
                        fprintf(stderr, "  -t UPDATE_TIMER can be from 1 to %d seconds. Default: %d.\n", UPDATE_EVERY_MAX, UPDATE_EVERY);
                        fprintf(stderr, "  -p LISTEN_PORT can be from 1 to %d. Default: %d.\n", 65535, LISTEN_PORT);

diff --git a/netdata.start b/netdata.start
index 770d7fa1aeea4231e608a1419296e45ce4f65cfe..046e7fa326124c5b56b3343b28e10ce6465f14fc 100755 (executable)
--- a/netdata.start
+++ b/netdata.start
@@ -45,6 +45,9 @@ then
                else
                        NETDATA_CONFIG_DEBUG=1
                fi
+
+               # find the user to run as
+               NETDATA_CONFIG_USER="`grep 'run as user = ' netdata.conf | head -n 1 | cut -d '=' -f 2 | sed s"/ //g"`"
        fi
 fi
 
@@ -64,6 +67,13 @@ killall netdata 2>/dev/null
 killall tc-all.sh 2>/dev/null
 sleep 2
 
+if [ "$USER" = "root" -a ! -z "$NETDATA_CONFIG_USER" ]
+then
+       chown -R "$NETDATA_CONFIG_USER" web || exit 1
+       chmod    0775 web   || exit 1
+       chmod -R 0664 web/* || exit 1
+fi
+
 echo "Starting netdata..."
 if [ -f netdata.conf ]
 then
@@ -73,9 +83,6 @@ else
 
        if [ "$USER" = "root" ]
        then
-               chown -R "$NETDATA_CONFIG_USER" web || exit 1
-               chmod    0775 web   || exit 1
-               chmod -R 0664 web/* || exit 1
                `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
        else
                echo >&2 "WARNING: NOT RUNNING AS ROOT - CANNOT SWITCH TO USER $NETDATA_CONFIG_USER"

diff --git a/web/datasource.html b/web/datasource.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/web/index.js b/web/index.js
old mode 100755 (executable)
new mode 100644 (file)