reported url now uses the rrdset name, not the id, since the id may contain slashes...

diff --git a/netdata.start b/netdata.start
index aab1b641d4b82e7a0db01c81207e5c05c7b68e23..a4682e536d7d6a45d99d707327fc4a63b09f483f 100755 (executable)
--- a/netdata.start
+++ b/netdata.start
@@ -60,10 +60,10 @@ echo "Compiling netdata (debug=$NETDATA_CONFIG_DEBUG)"
 if [ $NETDATA_CONFIG_DEBUG -eq 1 ]
 then
        ulimit -c unlimited
-       make install debug=1 # this installs in the current directory
+       make install debug=1 || exit 1 # this installs in the current directory
        debug_opts="-df 0xfffffadf"
 else
-       make install # this installs in the current directory
+       make install || exit 1 # this installs in the current directory
        debug_opts="-df 0x00000000"
 fi
 

diff --git a/src/daemon.c b/src/daemon.c
index 7728cf449bb3fbfdd77cf6c4c5de64385e685fef..d772743fbb5a7b23c11650c1bb99fe5ddddcab25 100755 (executable)
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -74,8 +74,9 @@ void prepare_rundir() {
        
        snprintf(pidfile, FILENAME_MAX, "%s/netdata.pid", rundir);
 
-       if(mkdir(rundir, 0775) != 0)
-               fprintf(stderr, "Cannot create directory '%s' (%s).", rundir, strerror(errno));
+       if(mkdir(rundir, 0775) != 0) {
+               if(errno != EEXIST) fprintf(stderr, "Cannot create directory '%s' (%s).", rundir, strerror(errno));
+       }
 }
 
 int become_user(const char *username)

diff --git a/src/plugins.d/apps_plugin.c b/src/plugins.d/apps_plugin.c
index e62cde68b26544a20bcb031a83be9d6f7433dd02..6d9a7b0472b806658ee6c49e11e946a36a9d5df9 100755 (executable)
--- a/src/plugins.d/apps_plugin.c
+++ b/src/plugins.d/apps_plugin.c
@@ -631,7 +631,7 @@ unsigned long file_descriptor_find_or_add(const char *name)
                if(c == 0) continue;
 
                if(!all_files[c].count) {
-                       if(debug) fprintf(stderr, "apps.plugin:   >> eximining slot %d.\n", c);
+                       if(debug) fprintf(stderr, "apps.plugin:   >> Examining slot %d.\n", c);
 
                        if(all_files[c].magic == 0x0BADCAFE && all_files[c].name && file_descriptor_find(all_files[c].name, all_files[c].hash))
                                error("apps.plugin: fd on position %d is not cleared properly. It still has %s in it.\n", c, all_files[c].name);
@@ -1715,6 +1715,8 @@ int main(int argc, char **argv)
 {
        // debug_flags = D_PROCFILE;
 
+       info("apps.plugin: starting...");
+
        unsigned long started_t = time(NULL), current_t;
        Hertz = get_hertz();
        pid_max = get_pid_max();

diff --git a/src/rrd2json.c b/src/rrd2json.c
index 01478a623ef81e4aee51cd358d71565e9d6a6230..12bb5dcae4b8cc2aa0d0a010c3a2ff2b0d3637c0 100755 (executable)
--- a/src/rrd2json.c
+++ b/src/rrd2json.c
@@ -47,7 +47,7 @@ unsigned long rrd_stats_one_json(RRDSET *st, char *options, struct web_buffer *w
                , st->priority
                , st->enabled
                , st->units
-               , st->id, options?options:""
+               , st->name, options?options:""
                , rrdset_type_name(st->chart_type)
                , st->counter
                , st->entries