X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Frrd.c;h=a9ff6243db06989c458a9ecf7f0b5480006d4f60;hb=9dccc16d3763392f0b13349de18c3a838a667653;hp=4361483a2fd8a55d2ed60385f08058122e0788e2;hpb=5b9054a89f2be6b0d47eaba8fc7cd5e923a9d35a;p=netdata.git

diff --git a/src/rrd.c b/src/rrd.c
index 4361483a..a9ff6243 100644
--- a/src/rrd.c
+++ b/src/rrd.c
@@ -11,9 +11,9 @@
 int rrd_delete_unupdated_dimensions = 0;
 */
 
-int rrd_update_every = UPDATE_EVERY;
-int rrd_default_history_entries = RRD_DEFAULT_HISTORY_ENTRIES;
-RRD_MEMORY_MODE rrd_memory_mode = RRD_MEMORY_MODE_SAVE;
+int default_rrd_update_every = UPDATE_EVERY;
+int default_rrd_history_entries = RRD_DEFAULT_HISTORY_ENTRIES;
+RRD_MEMORY_MODE default_rrd_memory_mode = RRD_MEMORY_MODE_SAVE;
 
 
 // ----------------------------------------------------------------------------
@@ -27,17 +27,22 @@ inline const char *rrd_memory_mode_name(RRD_MEMORY_MODE id) {
         case RRD_MEMORY_MODE_MAP:
             return RRD_MEMORY_MODE_MAP_NAME;
 
+        case RRD_MEMORY_MODE_NONE:
+            return RRD_MEMORY_MODE_NONE_NAME;
+
         case RRD_MEMORY_MODE_SAVE:
         default:
             return RRD_MEMORY_MODE_SAVE_NAME;
     }
 }
 
-int rrd_memory_mode_id(const char *name) {
+RRD_MEMORY_MODE rrd_memory_mode_id(const char *name) {
     if(unlikely(!strcmp(name, RRD_MEMORY_MODE_RAM_NAME)))
         return RRD_MEMORY_MODE_RAM;
     else if(unlikely(!strcmp(name, RRD_MEMORY_MODE_MAP_NAME)))
         return RRD_MEMORY_MODE_MAP;
+    else if(unlikely(!strcmp(name, RRD_MEMORY_MODE_NONE_NAME)))
+        return RRD_MEMORY_MODE_NONE;
 
     return RRD_MEMORY_MODE_SAVE;
 }
@@ -113,17 +118,17 @@ const char *rrdset_type_name(RRDSET_TYPE chart_type) {
 // ----------------------------------------------------------------------------
 // RRD - cache directory
 
-char *rrdset_cache_dir(const char *id) {
+char *rrdset_cache_dir(RRDHOST *host, const char *id, const char *config_section) {
     char *ret = NULL;
 
     char b[FILENAME_MAX + 1];
     char n[FILENAME_MAX + 1];
     rrdset_strncpyz_name(b, id, FILENAME_MAX);
 
-    snprintfz(n, FILENAME_MAX, "%s/%s", netdata_configured_cache_dir, b);
-    ret = config_get(id, "cache directory", n);
+    snprintfz(n, FILENAME_MAX, "%s/%s", host->cache_dir, b);
+    ret = config_get(config_section, "cache directory", n);
 
-    if(rrd_memory_mode == RRD_MEMORY_MODE_MAP || rrd_memory_mode == RRD_MEMORY_MODE_SAVE) {
+    if(host->rrd_memory_mode == RRD_MEMORY_MODE_MAP || host->rrd_memory_mode == RRD_MEMORY_MODE_SAVE) {
         int r = mkdir(ret, 0775);
         if(r != 0 && errno != EEXIST)
             error("Cannot create directory '%s'", ret);
@@ -131,4 +136,3 @@ char *rrdset_cache_dir(const char *id) {
 
     return ret;
 }
-