Track only servers with domain, no local developments

Author: ar2rsawseen

api/api.js

@@ -39,7 +39,9 @@ else {
 process.title = t.join(' ');
 
 plugins.connectToAllDatabases().then(function() {
-    tracker.enable();
+    plugins.loadConfigs(common.db, function() {
+        tracker.enable();
+    });
     common.writeBatcher = new WriteBatcher(common.db);
     common.readBatcher = new ReadBatcher(common.db);
     common.insertBatcher = new InsertBatcher(common.db);

api/jobs/ping.js

@@ -17,6 +17,9 @@ class PingJob extends job.Job {
             if (!offlineMode) {
                 var server = tracker.getBulkServer();
                 var user = tracker.getBulkUser(server);
+                if (!user) {
+                    return done();
+                }
                 var days = 90;
                 var current_sync = Date.now();
 

api/parts/mgmt/tracker.js

@@ -16,8 +16,7 @@ var tracker = {},
     server = "9c28c347849f2c03caf1b091ec7be8def435e85e",
     user = "fa6e9ae7b410cb6d756e8088c5f3936bf1fab5f3",
     url = "https://stats.count.ly",
-    plugins = require('../../../plugins/pluginManager.js'),
-    domain = plugins.getConfig("api").domain;
+    plugins = require('../../../plugins/pluginManager.js');
 
 var IS_FLEX = false;
 
@@ -51,26 +50,28 @@ tracker.enable = function() {
         storage_path: "../../../.sdk/",
         interval: 10000,
         fail_timeout: 600,
-        session_update: 120,
+        session_update: 60 * 60 * 12,
         remote_config: true,
         debug: (logger.getLevel("tracker:server") === "debug")
     };
+
+    var domain = plugins.getConfig("api").domain;
+
     //set static device id if domain is defined
     if (domain) {
         config.device_id = stripTrailingSlash((domain + "").split("://").pop());
     }
-    Countly.init(config);
 
-    //change device id if is it not domain
-    if (domain && Countly.get_device_id() !== domain) {
-        Countly.change_id(stripTrailingSlash((domain + "").split("://").pop()), true);
-    }
-    else if (!domain) {
-        checkDomain();
-    }
-    isEnabled = true;
-    Countly.user_details({"name": config.device_id });
-    plugins.loadConfigs(common.db, function() {
+    if (config.device_id && config.device_id !== "localhost") {
+        Countly.init(config);
+
+        //change device id if is it not domain
+        if (Countly.get_device_id() !== domain) {
+            Countly.change_id(stripTrailingSlash((domain + "").split("://").pop()), true);
+        }
+
+        isEnabled = true;
+        Countly.user_details({"name": config.device_id });
         if (plugins.getConfig("tracking").server_sessions) {
             Countly.begin_session(true);
         }
@@ -83,7 +84,7 @@ tracker.enable = function() {
             }
             collectServerData();
         }, 20000);
-    });
+    }
 };
 
 /**
@@ -103,7 +104,10 @@ tracker.getBulkServer = function() {
  * @returns {Object} Countly Bulk User instance
  */
 tracker.getBulkUser = function(serverInstance) {
-    return serverInstance.add_user({device_id: stripTrailingSlash((plugins.getConfig("api").domain + "").split("://").pop())});
+    var domain = stripTrailingSlash((plugins.getConfig("api").domain + "").split("://").pop());
+    if (domain && domain !== "localhost") {
+        return serverInstance.add_user({device_id: domain});
+    }
 };
 
 /**
@@ -224,20 +228,4 @@ function stripTrailingSlash(str) {
     return str;
 }
 
-//check every hour if domain was provided
-var checkDomain = function() {
-    if (!domain && domain !== plugins.getConfig("api").domain) {
-        domain = plugins.getConfig("api").domain;
-        if (Countly && isEnabled) {
-            Countly.change_id(stripTrailingSlash((domain + "").split("://").pop()), true);
-            Countly.userData.set("domain", domain);
-            Countly.user_details({"name": stripTrailingSlash((domain + "").split("://").pop())});
-            Countly.userData.save();
-        }
-    }
-    else if (!domain) {
-        setTimeout(checkDomain, 3600000);
-    }
-};
-
 module.exports = tracker;

frontend/express/app.js

@@ -414,6 +414,7 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
     };
 
     plugins.loadConfigs(countlyDb, function() {
+        tracker.enable();
         curTheme = plugins.getConfig("frontend").theme;
         app.loadThemeFiles(curTheme);
         app.dashboard_headers = plugins.getConfig("security").dashboard_additional_headers;

plugins/server-stats/api/jobs/stats.js

@@ -154,6 +154,9 @@ class StatsJob extends job.Job {
 
             var server = tracker.getBulkServer();
             var user = tracker.getBulkUser(server);
+            if (!user) {
+                return done();
+            }
             var days = 30;
             var current_sync = Date.now();
 

plugins/system-utility/api/api.js

@@ -1,6 +1,6 @@
 var plugin = {},
     common = require('../../../api/utils/common.js'),
-    tracker = require('../../../api/parts/mgmt/tracker.js'),
+    //tracker = require('../../../api/parts/mgmt/tracker.js'),
     plugins = require('../../pluginManager.js'),
     systemUtility = require('./system.utility'),
     log = common.log('system-utility:api'),
@@ -261,7 +261,7 @@ function stopWithTimeout(type, fromTimeout = false) {
 
     });
 
-    plugins.register("/master", function() {
+    /*plugins.register("/master", function() {
         //ping server stats periodically
         if (tracker.isEnabled()) {
             var timeout = 1000 * 60 * 15;
@@ -326,7 +326,7 @@ function stopWithTimeout(type, fromTimeout = false) {
             };
             getServerStats();
         }
-    });
+    });*/
 }(plugin));
 
 module.exports = plugin;