#1197 removes more circular references

include/http/request_handler.js

@@ -120,8 +120,6 @@ const UrlUtils = require('../../lib/utils/urlUtils');
      */
     RequestHandler.DEFAULT_THEME = Configuration.active.plugins.default;
 
-    RequestHandler.sites = {};
-    RequestHandler.redirectHosts = {};
     var GLOBAL_SITE = SiteUtils.GLOBAL_SITE;
 
     /**

include/service/entities/site_service.js

@@ -578,8 +578,10 @@ class SiteService extends BaseObjectService {
                 return hostname !== newHostname;
             });
             data.prevHostnames.push(prevHostname);
-            RequestHandler.redirectHosts[prevHostname] = newHostname;
-            RequestHandler.sites[prevHostname] = null;
+
+            //TODO [1.0] did this change prevent the ability for renamed sites to be active?
+            ActiveSiteService.setRedirectHost(prevHostname, newHostname);
+            ActiveSiteService.deregister(data.uid);
         }
         return data;
     }

include/system/analytics_manager.js

@@ -18,6 +18,7 @@
 
 //dependencies
 const _ = require('lodash');
+const ActiveSiteService = require('../../lib/service/sites/activeSiteService');
 const async  = require('async');
 const Configuration = require('../config');
 const domain = require('domain');
@@ -399,11 +400,12 @@ const ValidationService = require('../validation/validation_service');
      * providers.
      */
     AnalyticsManager.onPageRender = function(req, session, ls, cb) {
-        var context = {
-            site: RequestHandler.sites[req.headers.host] ? RequestHandler.sites[req.headers.host].uid : null,
+        let site = ActiveSiteService.getByHostname(req.headers.host);
+        let context = {
+            site: !!site ? site.uid : null,
             timeout: Configuration.active.analytics.timeout
         };
-        var managerInstance = new AnalyticsManager(context);
+        let managerInstance = new AnalyticsManager(context);
         managerInstance.gatherData(req, session, ls, cb);
     };
 

lib/service/sites/activeSiteService.js

@@ -69,7 +69,7 @@ class ActiveSiteService {
 
         //Populate redirect hosts index if this site has previous hostnames exist
         siteSpec.prevHostnames.forEach(function (oldHostname) {
-            REDIRECT_HOSTS[oldHostname] = siteSpec.hostname;
+            ActiveSiteService.setRedirectHost(oldHostname, siteSpec.hostname);
         });
 
         return true;
@@ -125,6 +125,15 @@ class ActiveSiteService {
     static getRedirectForHostname (hostname) {
         return REDIRECT_HOSTS[hostname];
     }
+
+    /**
+     *
+     * @param {string} hostname
+     * @param {string} redirectsToHostname
+     */
+    static setRedirectHost(hostname, redirectsToHostname) {
+        REDIRECT_HOSTS[hostname] = redirectsToHostname;
+    }
 }
 
 module.exports = ActiveSiteService;

plugins/ga/ga.js

@@ -18,6 +18,9 @@
 
 module.exports = function (pb) {
 
+    //pb dependencies
+    const ActiveSiteService = pb.ActiveSiteService;
+
     /**
      * GoogleAnalytics - A sample for exemplifying what the main module file should
      * look like.
@@ -91,7 +94,8 @@ module.exports = function (pb) {
      * @param {function} cb (Error, string)
      */
     GoogleAnalytics.onRequest = function(req, session, ls, cb) {
-        var siteId = pb.SiteService.getCurrentSite(pb.RequestHandler.sites[req.headers.host] ? pb.RequestHandler.sites[req.headers.host].uid : null);
+        let site = ActiveSiteService.getByHostname(req.headers.host);
+        var siteId = pb.SiteService.getCurrentSite(!!site ? site.uid : null);
         var context = {
             site: siteId,
             pluginService: new pb.PluginService({site: siteId}),