Refactor only: serve stats objects directly through StatsManager singleton

5 files changed, 17 insertions, 34 deletions

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index c9f7e8e..23b0afa 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -52,9 +52,7 @@ namespace OpenSim.Grid.AssetServer
         // Temporarily hardcoded - should be a plugin
         protected IAssetLoader assetLoader = new AssetLoaderFileSystem();        
         
-        private IAssetProvider m_assetProvider;
-        
-        protected AssetStatsReporter m_stats;      
+        private IAssetProvider m_assetProvider;    
 
         [STAThread]
         public static void Main(string[] args)
@@ -101,9 +99,9 @@ namespace OpenSim.Grid.AssetServer
             m_console.Verbose("ASSET", "Starting HTTP process");
             BaseHttpServer httpServer = new BaseHttpServer(m_config.HttpPort);
             
-            m_stats = new AssetStatsReporter();
+            StatsManager.StartCollectingAssetStats();
 
-            httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider, m_stats));
+            httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider));
             httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider));
 
             httpServer.Start();
@@ -184,7 +182,7 @@ namespace OpenSim.Grid.AssetServer
                     break;
                     
                 case "stats":
-                    m_console.Notice("STATS", Environment.NewLine + m_stats.Report());
+                    m_console.Notice("STATS", Environment.NewLine + StatsManager.AssetStats.Report());
                     break;
 
                 case "shutdown":
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index 9b288a7..5c497b6 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -43,22 +43,18 @@ namespace OpenSim.Grid.AssetServer
     {
         private OpenAsset_Main m_assetManager;
         private IAssetProvider m_assetProvider;
-        private AssetStatsReporter m_stats;
 
         /// <summary>
         /// Constructor.
         /// </summary>
         /// <param name="assetManager"></param>
         /// <param name="assetProvider"></param>
-        /// <param name="stats">Can be null if stats collection isn't required</param>
-        public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider,
-                                     AssetStatsReporter stats)
+        public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider)
             : base("GET", "/assets")
         {
             MainLog.Instance.Verbose("REST", "In Get Request");
             m_assetManager = assetManager;
             m_assetProvider = assetProvider;
-            m_stats = stats;
         }
         
         public override byte[] Handle(string path, Stream request)
@@ -80,8 +76,8 @@ namespace OpenSim.Grid.AssetServer
                         return result;
                     }   
     
-                    if (m_stats != null)
-                        m_stats.AddRequest();
+                    if (StatsManager.AssetStats != null)
+                        StatsManager.AssetStats.AddRequest();
                     
                     AssetBase asset = m_assetProvider.FetchAsset(assetID);
                     if (asset != null)
@@ -107,8 +103,8 @@ namespace OpenSim.Grid.AssetServer
                     }
                     else
                     {
-                        if (m_stats != null)
-                            m_stats.AddNotFoundRequest();
+                        if (StatsManager.AssetStats != null)
+                            StatsManager.AssetStats.AddNotFoundRequest();
                         
                         MainLog.Instance.Verbose("REST", "GET:/asset failed to find {0}", assetID);
                     }
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 2650694..20828ba 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -46,9 +46,7 @@ namespace OpenSim.Grid.UserServer
         
         public UserManager m_userManager;
         public UserLoginService m_loginService;
-        public MessageServersConnector m_messagesService;
-        
-        protected UserStatsReporter m_stats;        
+        public MessageServersConnector m_messagesService;        
 
         private LogBase m_console;
         private LLUUID m_lastCreatedUser = LLUUID.Random();
@@ -89,15 +87,15 @@ namespace OpenSim.Grid.UserServer
         {
             Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
             
-            m_stats = new UserStatsReporter();            
+            StatsManager.StartCollectingUserStats();
 
             MainLog.Instance.Verbose("REGION", "Establishing data connection");
-            m_userManager = new UserManager(m_stats);
+            m_userManager = new UserManager();            
             m_userManager._config = Cfg;
             m_userManager.AddPlugin(Cfg.DatabaseProvider);            
 
             m_loginService = new UserLoginService(
-                 m_userManager, new LibraryRootFolder(), m_stats, Cfg, Cfg.DefaultStartupMsg);
+                 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
 
             m_messagesService = new MessageServersConnector(MainLog.Instance);
 
@@ -199,7 +197,7 @@ namespace OpenSim.Grid.UserServer
                     break;
                     
                 case "stats":
-                    MainLog.Instance.Notice("STATS", Environment.NewLine + m_stats.Report());
+                    MainLog.Instance.Notice("STATS", Environment.NewLine + StatsManager.UserStats.Report());
                     break;                    
 
                 case "test-inventory":
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 0f02ad2..10f9468 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -55,8 +55,8 @@ namespace OpenSim.Grid.UserServer
 
         public UserLoginService(
             UserManagerBase userManager, LibraryRootFolder libraryRootFolder, 
-            UserStatsReporter statsCollector, UserConfig config, string welcomeMess)
-            : base(userManager, libraryRootFolder, statsCollector, welcomeMess)
+            UserConfig config, string welcomeMess)
+            : base(userManager, libraryRootFolder, welcomeMess)
         {
             m_config = config;
         }
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 778aec1..c36de7f 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -38,16 +38,7 @@ using OpenSim.Framework.UserManagement;
 namespace OpenSim.Grid.UserServer
 {
     public class UserManager : UserManagerBase
-    {        
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="statsCollector">Can be null if stats collection is not required.
-        /// </param>
-        public UserManager(UserStatsReporter statsCollector) : base(statsCollector)       
-        {
-        }        
-
+    {            
         /// <summary>
         /// Deletes an active agent session
         /// </summary>