* Refactor additional stats collection common code into base opensim server

* If extra stats not sent to the viewer are available on an opensim server, they are now uniformly accessible using the 'show stats' command

2 files changed, 4 insertions, 18 deletions

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 77e4628..1b1f9c7 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Grid.AssetServer
             m_log.Info("[ASSET]: Starting HTTP process");
             m_httpServer = new BaseHttpServer(m_config.HttpPort);
 
-            StatsManager.StartCollectingAssetStats();
+            m_stats = StatsManager.StartCollectingAssetStats();
 
             AddHttpHandlers();
 
@@ -179,16 +179,7 @@ namespace OpenSim.Grid.AssetServer
             base.RunCmd(cmd, cmdparams);
             
             switch (cmd)
-            {
-                case "help":
-                    m_console.Notice("stats - statistical information for this server");
-                    
-                    break;                  
-                    
-                case "stats":
-                    m_console.Notice("STATS", Environment.NewLine + StatsManager.AssetStats.Report());
-                    break;
-
+            {                                   
                 case "shutdown":
                     m_console.Close();
                     Environment.Exit(0);
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 7cd2431..00b7f76 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Grid.UserServer
         {
             Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
             
-            StatsManager.StartCollectingUserStats();
+            m_stats = StatsManager.StartCollectingUserStats();
 
             m_log.Info("[REGION]: Establishing data connection");
             m_userManager = new UserManager();            
@@ -219,16 +219,11 @@ namespace OpenSim.Grid.UserServer
             {
                 case "help":
                     m_console.Notice("create user - create a new user");
-                    m_console.Notice("stats - statistical information for this server");
                     break;
 
                 case "create":
                     do_create(cmdparams[0]);
-                    break;
-                    
-                case "stats":
-                    m_console.Notice(StatsManager.UserStats.Report());
-                    break;                    
+                    break;                  
 
                 case "test-inventory":
                     //  RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>();