aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-01-28 22:00:38 +0000
committerJustin Clarke Casey2008-01-28 22:00:38 +0000
commitbeefbb46d22d318d1964af16b3e4601e7e23709f (patch)
tree96670d4f9e7c463827e0ff2f394193305dcf65e0 /OpenSim/Grid/UserServer
parent* Move AssetStatsReporter to Framework.Statistics (diff)
downloadopensim-SC_OLD-beefbb46d22d318d1964af16b3e4601e7e23709f.zip
opensim-SC_OLD-beefbb46d22d318d1964af16b3e4601e7e23709f.tar.gz
opensim-SC_OLD-beefbb46d22d318d1964af16b3e4601e7e23709f.tar.bz2
opensim-SC_OLD-beefbb46d22d318d1964af16b3e4601e7e23709f.tar.xz
* Add total logouts (and total logins) to server side user stats
* Passing the stats collector through object chains is not ideal - this will change when more stats come in * This change will need a prebuild
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs9
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs13
2 files changed, 13 insertions, 9 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 1ae4bee..2650694 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -44,7 +44,6 @@ namespace OpenSim.Grid.UserServer
44 { 44 {
45 private UserConfig Cfg; 45 private UserConfig Cfg;
46 46
47
48 public UserManager m_userManager; 47 public UserManager m_userManager;
49 public UserLoginService m_loginService; 48 public UserLoginService m_loginService;
50 public MessageServersConnector m_messagesService; 49 public MessageServersConnector m_messagesService;
@@ -89,13 +88,13 @@ namespace OpenSim.Grid.UserServer
89 public void Startup() 88 public void Startup()
90 { 89 {
91 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 90 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
91
92 m_stats = new UserStatsReporter();
92 93
93 MainLog.Instance.Verbose("REGION", "Establishing data connection"); 94 MainLog.Instance.Verbose("REGION", "Establishing data connection");
94 m_userManager = new UserManager(); 95 m_userManager = new UserManager(m_stats);
95 m_userManager._config = Cfg; 96 m_userManager._config = Cfg;
96 m_userManager.AddPlugin(Cfg.DatabaseProvider); 97 m_userManager.AddPlugin(Cfg.DatabaseProvider);
97
98 m_stats = new UserStatsReporter();
99 98
100 m_loginService = new UserLoginService( 99 m_loginService = new UserLoginService(
101 m_userManager, new LibraryRootFolder(), m_stats, Cfg, Cfg.DefaultStartupMsg); 100 m_userManager, new LibraryRootFolder(), m_stats, Cfg, Cfg.DefaultStartupMsg);
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 3f2aa5b..778aec1 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -32,16 +32,21 @@ using System.Text.RegularExpressions;
32using libsecondlife; 32using libsecondlife;
33using Nwc.XmlRpc; 33using Nwc.XmlRpc;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Statistics;
35using OpenSim.Framework.UserManagement; 36using OpenSim.Framework.UserManagement;
36 37
37namespace OpenSim.Grid.UserServer 38namespace OpenSim.Grid.UserServer
38{ 39{
39 public class UserManager : UserManagerBase 40 public class UserManager : UserManagerBase
40 { 41 {
41 public UserManager() 42 /// <summary>
43 /// Constructor.
44 /// </summary>
45 /// <param name="statsCollector">Can be null if stats collection is not required.
46 /// </param>
47 public UserManager(UserStatsReporter statsCollector) : base(statsCollector)
42 { 48 {
43 } 49 }
44
45 50
46 /// <summary> 51 /// <summary>
47 /// Deletes an active agent session 52 /// Deletes an active agent session