From a1c9349d4765833691e7816d7f4df7bd37b9ee36 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 4 Feb 2008 16:22:58 +0000
Subject: Refactor only: serve stats objects directly through StatsManager
 singleton

---
 OpenSim/Grid/UserServer/Main.cs             | 12 +++++-------
 OpenSim/Grid/UserServer/UserLoginService.cs |  4 ++--
 OpenSim/Grid/UserServer/UserManager.cs      | 11 +----------
 3 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'OpenSim/Grid/UserServer')

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>
-- 
cgit v1.1