Moved Functionality in Storage

Countly · Aug 14, 2024 · 1836f45 · 1836f45
1 parent 8cb8b57
commit 1836f45
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/lib/countly-bulk.js b/lib/countly-bulk.js
@@ -104,21 +104,7 @@ function CountlyBulk(conf) {
     conf.maxStackTraceLinesPerThread = conf.max_stack_trace_lines_per_thread || maxStackTraceLinesPerThread;
     conf.maxStackTraceLineLength = conf.max_stack_trace_line_length || maxStackTraceLineLength;
 
-    CountlyStorage.setBulkDataPath(conf.storage_path);
-
-    var mainDir = path.resolve(__dirname, CountlyStorage.getStoragePath());
-    if (conf.persist_queue) {
-        try {
-            if (!fs.existsSync(mainDir)) {
-                fs.mkdirSync(mainDir);
-            }
-        }
-        catch (ex) {
-            // problem creating directory
-            // eslint-disable-next-line no-console
-            cc.log(cc.logLevelEnums.ERROR, "CountlyBulk, Failed white creating the '/data' directory. Error: ", ex.stack);
-        }
-    }
+    CountlyStorage.setBulkDataPath(conf.storage_path, conf.persist_queue);
 
     this.conf = conf;
     /**

diff --git a/lib/countly-storage.js b/lib/countly-storage.js
@@ -9,10 +9,34 @@ var defaultBulkPath = "../bulk_data/"; // Default path
 
 var setStoragePath = function(userPath) {
     storagePath = userPath || defaultPath;
+
+    var dir = path.resolve(__dirname, getStoragePath());
+    try {
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+    }
+    catch (ex) {
+        // problem creating data dir
+        cc.log(cc.logLevelEnums.ERROR, `setStoragePath, Failed to create the '/data' folder: ${ex}`);
+    }
 };
 
-var setBulkDataPath = function(userPath) {
+var setBulkDataPath = function(userPath, persistQueue) {
     storagePath = userPath || defaultBulkPath;
+    var mainDir = path.resolve(__dirname, getStoragePath());
+    if (persistQueue) {
+        try {
+            if (!fs.existsSync(mainDir)) {
+                fs.mkdirSync(mainDir);
+            }
+        }
+        catch (ex) {
+            // problem creating directory
+            // eslint-disable-next-line no-console
+            cc.log(cc.logLevelEnums.ERROR, "setBulkDataPath, Failed white creating the '/data' directory. Error: ", ex.stack);
+        }
+    }
 };
 
 var getStoragePath = function() {

diff --git a/lib/countly.js b/lib/countly.js
@@ -173,16 +173,6 @@ Countly.Bulk = Bulk;
             cc.debug = conf.debug;
             CountlyStorage.setStoragePath(conf.storage_path);
 
-            var dir = path.resolve(__dirname, CountlyStorage.getStoragePath());
-            try {
-                if (!fs.existsSync(dir)) {
-                    fs.mkdirSync(dir, { recursive: true });
-                }
-            }
-            catch (ex) {
-                // problem creating data dir
-                cc.log(cc.logLevelEnums.ERROR, `init, Failed to create the '/data' folder: ${ex}`);
-            }
             // clear stored device ID if flag is set
             if (conf.clear_stored_device_id) {
                 cc.log(cc.logLevelEnums.WARNING, "init, clear_stored_device_id is true, erasing the stored ID.");