diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index a2881e6..1ae4bee 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -34,6 +34,7 @@ using OpenSim.Framework; | |||
34 | using OpenSim.Framework.Communications.Cache; | 34 | using OpenSim.Framework.Communications.Cache; |
35 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework.Statistics; | ||
37 | 38 | ||
38 | namespace OpenSim.Grid.UserServer | 39 | namespace OpenSim.Grid.UserServer |
39 | { | 40 | { |
@@ -47,6 +48,8 @@ namespace OpenSim.Grid.UserServer | |||
47 | public UserManager m_userManager; | 48 | public UserManager m_userManager; |
48 | public UserLoginService m_loginService; | 49 | public UserLoginService m_loginService; |
49 | public MessageServersConnector m_messagesService; | 50 | public MessageServersConnector m_messagesService; |
51 | |||
52 | protected UserStatsReporter m_stats; | ||
50 | 53 | ||
51 | private LogBase m_console; | 54 | private LogBase m_console; |
52 | private LLUUID m_lastCreatedUser = LLUUID.Random(); | 55 | private LLUUID m_lastCreatedUser = LLUUID.Random(); |
@@ -91,9 +94,11 @@ namespace OpenSim.Grid.UserServer | |||
91 | m_userManager = new UserManager(); | 94 | m_userManager = new UserManager(); |
92 | m_userManager._config = Cfg; | 95 | m_userManager._config = Cfg; |
93 | m_userManager.AddPlugin(Cfg.DatabaseProvider); | 96 | m_userManager.AddPlugin(Cfg.DatabaseProvider); |
97 | |||
98 | m_stats = new UserStatsReporter(); | ||
94 | 99 | ||
95 | m_loginService = new UserLoginService( | 100 | m_loginService = new UserLoginService( |
96 | m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); | 101 | m_userManager, new LibraryRootFolder(), m_stats, Cfg, Cfg.DefaultStartupMsg); |
97 | 102 | ||
98 | m_messagesService = new MessageServersConnector(MainLog.Instance); | 103 | m_messagesService = new MessageServersConnector(MainLog.Instance); |
99 | 104 | ||
@@ -180,6 +185,7 @@ namespace OpenSim.Grid.UserServer | |||
180 | { | 185 | { |
181 | case "help": | 186 | case "help": |
182 | m_console.Notice("create user - create a new user"); | 187 | m_console.Notice("create user - create a new user"); |
188 | m_console.Notice("stats - statistical information for this server"); | ||
183 | m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)"); | 189 | m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)"); |
184 | break; | 190 | break; |
185 | 191 | ||
@@ -192,6 +198,10 @@ namespace OpenSim.Grid.UserServer | |||
192 | m_console.Close(); | 198 | m_console.Close(); |
193 | Environment.Exit(0); | 199 | Environment.Exit(0); |
194 | break; | 200 | break; |
201 | |||
202 | case "stats": | ||
203 | MainLog.Instance.Notice("STATS", Environment.NewLine + m_stats.Report()); | ||
204 | break; | ||
195 | 205 | ||
196 | case "test-inventory": | 206 | case "test-inventory": |
197 | // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); | 207 | // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); |