aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-01-25 19:24:25 +0000
committerJustin Clarke Casey2008-01-25 19:24:25 +0000
commit90c853685c14e186a3dfd06b7a584d16bf520ccf (patch)
treec55acd1c4577b257da0cb73f9b092e1ac79912e7 /OpenSim/Region
parentImplemented a suggestion from Mic Bowman regarding border crossing and Signif... (diff)
downloadopensim-SC_OLD-90c853685c14e186a3dfd06b7a584d16bf520ccf.zip
opensim-SC_OLD-90c853685c14e186a3dfd06b7a584d16bf520ccf.tar.gz
opensim-SC_OLD-90c853685c14e186a3dfd06b7a584d16bf520ccf.tar.bz2
opensim-SC_OLD-90c853685c14e186a3dfd06b7a584d16bf520ccf.tar.xz
* Add very basic initial login stats to the user server
* Typing 'stats' on the command line will given total number of successful logins today and yesterday * A little bit more to come, probably * Refactoring will follow next
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs3
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs10
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs3
3 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 9da1c05..9484e15 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -327,9 +327,10 @@ namespace OpenSim
327 inventoryService, backendService, backendService, m_dumpAssetsToFile); 327 inventoryService, backendService, backendService, m_dumpAssetsToFile);
328 m_commsManager = localComms; 328 m_commsManager = localComms;
329 329
330 // TODO No user stats collection yet for standalone
330 m_loginService = 331 m_loginService =
331 new LocalLoginService(userService, m_standaloneWelcomeMessage, localComms, m_networkServersInfo, 332 new LocalLoginService(userService, m_standaloneWelcomeMessage, localComms, m_networkServersInfo,
332 m_standaloneAuthenticate); 333 null, m_standaloneAuthenticate);
333 m_loginService.OnLoginToRegion += backendService.AddNewSession; 334 m_loginService.OnLoginToRegion += backendService.AddNewSession;
334 335
335 // XMLRPC action 336 // XMLRPC action
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 38f1970..7dee2cb 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -34,6 +34,7 @@ using libsecondlife;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Statistics;
37using OpenSim.Framework.UserManagement; 38using OpenSim.Framework.UserManagement;
38using InventoryFolder=OpenSim.Framework.InventoryFolder; 39using InventoryFolder=OpenSim.Framework.InventoryFolder;
39 40
@@ -52,9 +53,10 @@ namespace OpenSim.Region.Communications.Local
52 53
53 public event LoginToRegionEvent OnLoginToRegion; 54 public event LoginToRegionEvent OnLoginToRegion;
54 55
55 public LocalLoginService(UserManagerBase userManager, string welcomeMess, CommunicationsLocal parent, 56 public LocalLoginService(UserManagerBase userManager, string welcomeMess,
56 NetworkServersInfo serversInfo, bool authenticate) 57 CommunicationsLocal parent, NetworkServersInfo serversInfo,
57 : base(userManager, parent.UserProfileCacheService.libraryRoot, welcomeMess) 58 UserStatsReporter statsCollector, bool authenticate)
59 : base(userManager, parent.UserProfileCacheService.libraryRoot, statsCollector, welcomeMess)
58 { 60 {
59 m_Parent = parent; 61 m_Parent = parent;
60 this.serversInfo = serversInfo; 62 this.serversInfo = serversInfo;
@@ -228,4 +230,4 @@ namespace OpenSim.Region.Communications.Local
228 230
229 } 231 }
230 } 232 }
231} \ No newline at end of file 233}
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 8b8bcf4..485d657 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -88,7 +88,8 @@ namespace SimpleApp
88 m_commsManager = localComms; 88 m_commsManager = localComms;
89 89
90 LocalLoginService loginService = 90 LocalLoginService loginService =
91 new LocalLoginService(userService, String.Empty, localComms, m_networkServersInfo, false); 91 new LocalLoginService(
92 userService, String.Empty, localComms, m_networkServersInfo, null, false);
92 loginService.OnLoginToRegion += backendService.AddNewSession; 93 loginService.OnLoginToRegion += backendService.AddNewSession;
93 94
94 m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); 95 m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);