diff options
author | Diva Canto | 2010-05-07 21:32:02 -0700 |
---|---|---|
committer | Diva Canto | 2010-05-07 21:32:02 -0700 |
commit | 15562017f220e2474b548f860ce1174541d7e22f (patch) | |
tree | 8290f1402454ae9c5653eaa9c49e2791fc8deee9 /OpenSim/Region | |
parent | GridUserService in place. Replaces the contrived concept of storing user's ho... (diff) | |
download | opensim-SC-15562017f220e2474b548f860ce1174541d7e22f.zip opensim-SC-15562017f220e2474b548f860ce1174541d7e22f.tar.gz opensim-SC-15562017f220e2474b548f860ce1174541d7e22f.tar.bz2 opensim-SC-15562017f220e2474b548f860ce1174541d7e22f.tar.xz |
These files are part of the GridUserService write-up.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs | 116 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs | 153 |
2 files changed, 269 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs new file mode 100644 index 0000000..6c01927 --- /dev/null +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs | |||
@@ -0,0 +1,116 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | using System; | ||
28 | using System.Collections.Generic; | ||
29 | using System.Reflection; | ||
30 | |||
31 | using OpenSim.Framework; | ||
32 | using OpenSim.Region.Framework.Scenes; | ||
33 | using OpenSim.Services.Interfaces; | ||
34 | |||
35 | using OpenMetaverse; | ||
36 | using log4net; | ||
37 | |||
38 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser | ||
39 | { | ||
40 | public class ActivityDetector | ||
41 | { | ||
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
43 | |||
44 | private IGridUserService m_GridUserService; | ||
45 | private Scene m_aScene; | ||
46 | |||
47 | public ActivityDetector(IGridUserService guservice) | ||
48 | { | ||
49 | m_GridUserService = guservice; | ||
50 | m_log.DebugFormat("[ACTIVITY DETECTOR]: starting "); | ||
51 | } | ||
52 | |||
53 | public void AddRegion(Scene scene) | ||
54 | { | ||
55 | // For now the only events we listen to are these | ||
56 | // But we could trigger the position update more often | ||
57 | scene.EventManager.OnMakeRootAgent += OnMakeRootAgent; | ||
58 | scene.EventManager.OnNewClient += OnNewClient; | ||
59 | scene.EventManager.OnAvatarEnteringNewParcel += OnEnteringNewParcel; | ||
60 | |||
61 | if (m_aScene == null) | ||
62 | m_aScene = scene; | ||
63 | } | ||
64 | |||
65 | public void RemoveRegion(Scene scene) | ||
66 | { | ||
67 | scene.EventManager.OnMakeRootAgent -= OnMakeRootAgent; | ||
68 | scene.EventManager.OnNewClient -= OnNewClient; | ||
69 | } | ||
70 | |||
71 | public void OnMakeRootAgent(ScenePresence sp) | ||
72 | { | ||
73 | m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName); | ||
74 | |||
75 | m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); | ||
76 | } | ||
77 | |||
78 | public void OnNewClient(IClientAPI client) | ||
79 | { | ||
80 | client.OnConnectionClosed += OnConnectionClose; | ||
81 | } | ||
82 | |||
83 | public void OnConnectionClose(IClientAPI client) | ||
84 | { | ||
85 | if (client.IsLoggingOut) | ||
86 | { | ||
87 | object sp = null; | ||
88 | Vector3 position = new Vector3(128, 128, 0); | ||
89 | Vector3 lookat = new Vector3(0, 1, 0); | ||
90 | |||
91 | if (client.Scene.TryGetScenePresence(client.AgentId, out sp)) | ||
92 | { | ||
93 | if (sp is ScenePresence) | ||
94 | { | ||
95 | if (((ScenePresence)sp).IsChildAgent) | ||
96 | return; | ||
97 | |||
98 | position = ((ScenePresence)sp).AbsolutePosition; | ||
99 | lookat = ((ScenePresence)sp).Lookat; | ||
100 | } | ||
101 | } | ||
102 | m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName); | ||
103 | m_GridUserService.LoggedOut(client.AgentId.ToString(), client.Scene.RegionInfo.RegionID, position, lookat); | ||
104 | } | ||
105 | |||
106 | } | ||
107 | |||
108 | void OnEnteringNewParcel(ScenePresence sp, int localLandID, UUID regionID) | ||
109 | { | ||
110 | // TODO: grab the parcel ID from ILandModule | ||
111 | // and send that along | ||
112 | m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); | ||
113 | } | ||
114 | |||
115 | } | ||
116 | } | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs new file mode 100644 index 0000000..e3e2e61 --- /dev/null +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs | |||
@@ -0,0 +1,153 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | using System; | ||
28 | using System.Collections.Generic; | ||
29 | using System.Reflection; | ||
30 | |||
31 | using OpenSim.Region.Framework.Interfaces; | ||
32 | using OpenSim.Region.Framework.Scenes; | ||
33 | using OpenSim.Server.Base; | ||
34 | using OpenSim.Services.Interfaces; | ||
35 | using OpenSim.Services.Connectors; | ||
36 | |||
37 | using OpenMetaverse; | ||
38 | using log4net; | ||
39 | using Nini.Config; | ||
40 | |||
41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser | ||
42 | { | ||
43 | public class RemoteGridUserServicesConnector : ISharedRegionModule, IGridUserService | ||
44 | { | ||
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
46 | |||
47 | #region ISharedRegionModule | ||
48 | |||
49 | private bool m_Enabled = false; | ||
50 | |||
51 | private ActivityDetector m_ActivityDetector; | ||
52 | private IGridUserService m_RemoteConnector; | ||
53 | |||
54 | public Type ReplaceableInterface | ||
55 | { | ||
56 | get { return null; } | ||
57 | } | ||
58 | |||
59 | public string Name | ||
60 | { | ||
61 | get { return "RemoteGridUserServicesConnector"; } | ||
62 | } | ||
63 | |||
64 | public void Initialise(IConfigSource source) | ||
65 | { | ||
66 | IConfig moduleConfig = source.Configs["Modules"]; | ||
67 | if (moduleConfig != null) | ||
68 | { | ||
69 | string name = moduleConfig.GetString("GridUserServices", ""); | ||
70 | if (name == Name) | ||
71 | { | ||
72 | m_RemoteConnector = new GridUserServicesConnector(source); | ||
73 | |||
74 | m_Enabled = true; | ||
75 | |||
76 | m_ActivityDetector = new ActivityDetector(this); | ||
77 | |||
78 | m_log.Info("[REMOTE GRID USER CONNECTOR]: Remote grid user enabled"); | ||
79 | } | ||
80 | } | ||
81 | |||
82 | } | ||
83 | |||
84 | public void PostInitialise() | ||
85 | { | ||
86 | } | ||
87 | |||
88 | public void Close() | ||
89 | { | ||
90 | } | ||
91 | |||
92 | public void AddRegion(Scene scene) | ||
93 | { | ||
94 | if (!m_Enabled) | ||
95 | return; | ||
96 | |||
97 | scene.RegisterModuleInterface<IGridUserService>(this); | ||
98 | m_ActivityDetector.AddRegion(scene); | ||
99 | |||
100 | m_log.InfoFormat("[REMOTE GRID USER CONNECTOR]: Enabled remote grid user for region {0}", scene.RegionInfo.RegionName); | ||
101 | |||
102 | } | ||
103 | |||
104 | public void RemoveRegion(Scene scene) | ||
105 | { | ||
106 | if (!m_Enabled) | ||
107 | return; | ||
108 | |||
109 | m_ActivityDetector.RemoveRegion(scene); | ||
110 | } | ||
111 | |||
112 | public void RegionLoaded(Scene scene) | ||
113 | { | ||
114 | if (!m_Enabled) | ||
115 | return; | ||
116 | |||
117 | } | ||
118 | |||
119 | #endregion | ||
120 | |||
121 | #region IGridUserService | ||
122 | |||
123 | public GridUserInfo LoggedIn(string userID) | ||
124 | { | ||
125 | m_log.Warn("[REMOTE GRID USER CONNECTOR]: LoggedIn not implemented at the simulators"); | ||
126 | return null; | ||
127 | } | ||
128 | |||
129 | public bool LoggedOut(string userID, UUID region, Vector3 position, Vector3 lookat) | ||
130 | { | ||
131 | return m_RemoteConnector.LoggedOut(userID, region, position, lookat); | ||
132 | } | ||
133 | |||
134 | |||
135 | public bool SetHome(string userID, UUID regionID, Vector3 position, Vector3 lookAt) | ||
136 | { | ||
137 | return m_RemoteConnector.SetHome(userID, regionID, position, lookAt); | ||
138 | } | ||
139 | |||
140 | public bool SetLastPosition(string userID, UUID regionID, Vector3 position, Vector3 lookAt) | ||
141 | { | ||
142 | return m_RemoteConnector.SetLastPosition(userID, regionID, position, lookAt); | ||
143 | } | ||
144 | |||
145 | public GridUserInfo GetGridUserInfo(string userID) | ||
146 | { | ||
147 | return m_RemoteConnector.GetGridUserInfo(userID); | ||
148 | } | ||
149 | |||
150 | #endregion | ||
151 | |||
152 | } | ||
153 | } | ||