3 files changed, 149 insertions, 2 deletions

diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 3a68bfb..1707607 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -38,6 +38,7 @@ using Nwc.XmlRpc;
 
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
+using OpenSim.Framework.Statistics;
 
 namespace OpenSim.Framework.UserManagement
 {
@@ -47,16 +48,28 @@ namespace OpenSim.Framework.UserManagement
         protected UserManagerBase m_userManager = null;
         protected Mutex m_loginMutex = new Mutex(false);
         
+        protected UserStatsReporter m_statsCollector;        
+        
         /// <summary>
         /// Used during login to send the skeleton of the OpenSim Library to the client.
         /// </summary>
         protected LibraryRootFolder m_libraryRootFolder;
 
-        public LoginService(
-            UserManagerBase userManager, LibraryRootFolder libraryRootFolder, string welcomeMess)
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="userManager"></param>
+        /// <param name="libraryRootFolder"></param>
+        /// <param name="statsCollector">
+        /// An object for collecting statistical information.  
+        /// Can be null if statistics are not required</param>
+        /// <param name="welcomeMess"></param>
+        public LoginService(UserManagerBase userManager, LibraryRootFolder libraryRootFolder, 
+                            UserStatsReporter statsCollector, string welcomeMess)
         {
             m_userManager = userManager;
             m_libraryRootFolder = libraryRootFolder;
+            m_statsCollector = statsCollector;
             
             if (welcomeMess != String.Empty)
             {
@@ -211,6 +224,11 @@ namespace OpenSim.Framework.UserManagement
                             //return logResponse.ToXmlRpcResponse();
                         }
                         CommitAgent(ref userProfile);
+                        
+                        // If we reach this point, then the login has successfully logged onto the grid
+                        if (m_statsCollector != null)
+                            m_statsCollector.AddSuccessfulLogin();
+                        
                         return logResponse.ToXmlRpcResponse();
                     }
 
@@ -338,6 +356,10 @@ namespace OpenSim.Framework.UserManagement
                         }
 
                         CommitAgent(ref userProfile);
+                        
+                        // If we reach this point, then the login has successfully logged onto the grid
+                        if (m_statsCollector != null)
+                            m_statsCollector.AddSuccessfulLogin();                        
 
                         return logResponse.ToLLSDResponse();
                     }
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
new file mode 100644
index 0000000..28a5b25
--- /dev/null
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -0,0 +1,43 @@
+/*

+* Copyright (c) Contributors, http://opensimulator.org/

+* See CONTRIBUTORS.TXT for a full list of copyright holders.

+*

+* Redistribution and use in source and binary forms, with or without

+* modification, are permitted provided that the following conditions are met:

+*     * Redistributions of source code must retain the above copyright

+*       notice, this list of conditions and the following disclaimer.

+*     * Redistributions in binary form must reproduce the above copyright

+*       notice, this list of conditions and the following disclaimer in the

+*       documentation and/or other materials provided with the distribution.

+*     * Neither the name of the OpenSim Project nor the

+*       names of its contributors may be used to endorse or promote products

+*       derived from this software without specific prior written permission.

+*

+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+* 

+*/

+

+using System;

+

+namespace OpenSim.Framework.Servers

+{

+    /// <summary>

+    /// Common base for the main OpenSimServers (user, grid, inventory, region, etc)

+    /// XXX Not yet implemented, may not grow up for some time

+    /// </summary>

+    public class BaseOpenSimServer

+    {

+        public BaseOpenSimServer()

+        {

+        }

+    }

+}

diff --git a/OpenSim/Framework/Statistics/UserStatsReporter.cs b/OpenSim/Framework/Statistics/UserStatsReporter.cs
new file mode 100755
index 0000000..9b3a13f
--- /dev/null
+++ b/OpenSim/Framework/Statistics/UserStatsReporter.cs
@@ -0,0 +1,82 @@
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System.Text;
+using System.Timers;
+
+namespace OpenSim.Framework.Statistics
+{
+    /// <summary>
+    /// Description of UserStatsReporter.
+    /// </summary>
+    public class UserStatsReporter
+    {
+        private Timer ageStatsTimer = new Timer(24 * 60 * 60 * 1000);
+        
+        private int successfulLoginsToday;
+        public int SuccessfulLoginsToday { get { return successfulLoginsToday; } }
+        
+        private int successfulLoginsYesterday;
+        public int SuccessfulLoginsYesterday { get { return successfulLoginsYesterday; } }       
+        
+        public UserStatsReporter()
+        {
+            ageStatsTimer.Elapsed += new ElapsedEventHandler(OnAgeing);
+            ageStatsTimer.Enabled = true;
+        }
+        
+        private void OnAgeing(object source, ElapsedEventArgs e)
+        {
+            successfulLoginsYesterday = successfulLoginsToday;
+            
+            // There is a possibility that an asset request could occur between the execution of these
+            // two statements.  But we're better off without the synchronization overhead.
+            successfulLoginsToday = 0;            
+        }
+        
+        /// <summary>
+        /// Record a successful login
+        /// </summary>
+        public void AddSuccessfulLogin()
+        {
+            successfulLoginsToday++;
+        }
+
+        /// <summary>
+        /// Report back collected statistical information.
+        /// </summary>
+        /// <returns></returns>
+        public string Report()
+        {
+            return string.Format(
+@"Successful logins today     : {0}
+Successful logins yesterday : {1}",
+                SuccessfulLoginsToday, SuccessfulLoginsYesterday);
+        }
+    }
+}