diff options
Diffstat (limited to 'OpenSim/Services/Connectors')
10 files changed, 229 insertions, 301 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index 65b3537..ad18a23 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
@@ -30,6 +30,7 @@ using System; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Timers; | ||
33 | using Nini.Config; | 34 | using Nini.Config; |
34 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
@@ -48,7 +49,9 @@ namespace OpenSim.Services.Connectors | |||
48 | 49 | ||
49 | private string m_ServerURI = String.Empty; | 50 | private string m_ServerURI = String.Empty; |
50 | private IImprovedAssetCache m_Cache = null; | 51 | private IImprovedAssetCache m_Cache = null; |
51 | 52 | private int m_retryCounter; | |
53 | private Dictionary<int, List<AssetBase>> m_retryQueue = new Dictionary<int, List<AssetBase>>(); | ||
54 | private Timer m_retryTimer; | ||
52 | public AssetServicesConnector() | 55 | public AssetServicesConnector() |
53 | { | 56 | { |
54 | } | 57 | } |
@@ -85,6 +88,55 @@ namespace OpenSim.Services.Connectors | |||
85 | MainConsole.Instance.Commands.AddCommand("asset", false, "dump asset", | 88 | MainConsole.Instance.Commands.AddCommand("asset", false, "dump asset", |
86 | "dump asset <id> <file>", | 89 | "dump asset <id> <file>", |
87 | "dump one cached asset", HandleDumpAsset); | 90 | "dump one cached asset", HandleDumpAsset); |
91 | |||
92 | m_retryTimer = new Timer(); | ||
93 | m_retryTimer.Elapsed += new ElapsedEventHandler(retryCheck); | ||
94 | m_retryTimer.Interval = 60000; | ||
95 | } | ||
96 | |||
97 | protected void retryCheck(object source, ElapsedEventArgs e) | ||
98 | { | ||
99 | m_retryCounter++; | ||
100 | if (m_retryCounter > 60) m_retryCounter -= 60; | ||
101 | List<int> keys = new List<int>(); | ||
102 | foreach (int a in m_retryQueue.Keys) | ||
103 | { | ||
104 | keys.Add(a); | ||
105 | } | ||
106 | foreach (int a in keys) | ||
107 | { | ||
108 | //We exponentially fall back on frequency until we reach one attempt per hour | ||
109 | //The net result is that we end up in the queue for roughly 24 hours.. | ||
110 | //24 hours worth of assets could be a lot, so the hope is that the region admin | ||
111 | //will have gotten the asset connector back online quickly! | ||
112 | |||
113 | int timefactor = a ^ 2; | ||
114 | if (timefactor > 60) | ||
115 | { | ||
116 | timefactor = 60; | ||
117 | } | ||
118 | |||
119 | //First, find out if we care about this timefactor | ||
120 | if (timefactor % a == 0) | ||
121 | { | ||
122 | //Yes, we do! | ||
123 | List<AssetBase> retrylist = m_retryQueue[a]; | ||
124 | m_retryQueue.Remove(a); | ||
125 | |||
126 | foreach(AssetBase ass in retrylist) | ||
127 | { | ||
128 | Store(ass); //Store my ass. This function will put it back in the dictionary if it fails | ||
129 | } | ||
130 | } | ||
131 | } | ||
132 | |||
133 | if (m_retryQueue.Count == 0) | ||
134 | { | ||
135 | //It might only be one tick per minute, but I have | ||
136 | //repented and abandoned my wasteful ways | ||
137 | m_retryCounter = 0; | ||
138 | m_retryTimer.Stop(); | ||
139 | } | ||
88 | } | 140 | } |
89 | 141 | ||
90 | protected void SetCache(IImprovedAssetCache cache) | 142 | protected void SetCache(IImprovedAssetCache cache) |
@@ -99,8 +151,8 @@ namespace OpenSim.Services.Connectors | |||
99 | AssetBase asset = null; | 151 | AssetBase asset = null; |
100 | if (m_Cache != null) | 152 | if (m_Cache != null) |
101 | asset = m_Cache.Get(id); | 153 | asset = m_Cache.Get(id); |
102 | 154 | ||
103 | if (asset == null) | 155 | if (asset == null || asset.Data == null || asset.Data.Length == 0) |
104 | { | 156 | { |
105 | asset = SynchronousRestObjectRequester. | 157 | asset = SynchronousRestObjectRequester. |
106 | MakeRequest<int, AssetBase>("GET", uri, 0); | 158 | MakeRequest<int, AssetBase>("GET", uri, 0); |
@@ -177,7 +229,7 @@ namespace OpenSim.Services.Connectors | |||
177 | if (m_Cache != null) | 229 | if (m_Cache != null) |
178 | asset = m_Cache.Get(id); | 230 | asset = m_Cache.Get(id); |
179 | 231 | ||
180 | if (asset == null) | 232 | if (asset == null || asset.Data == null || asset.Data.Length == 0) |
181 | { | 233 | { |
182 | bool result = false; | 234 | bool result = false; |
183 | 235 | ||
@@ -204,11 +256,10 @@ namespace OpenSim.Services.Connectors | |||
204 | 256 | ||
205 | public string Store(AssetBase asset) | 257 | public string Store(AssetBase asset) |
206 | { | 258 | { |
259 | if (m_Cache != null) | ||
260 | m_Cache.Cache(asset); | ||
207 | if (asset.Temporary || asset.Local) | 261 | if (asset.Temporary || asset.Local) |
208 | { | 262 | { |
209 | if (m_Cache != null) | ||
210 | m_Cache.Cache(asset); | ||
211 | |||
212 | return asset.ID; | 263 | return asset.ID; |
213 | } | 264 | } |
214 | 265 | ||
@@ -218,24 +269,57 @@ namespace OpenSim.Services.Connectors | |||
218 | try | 269 | try |
219 | { | 270 | { |
220 | newID = SynchronousRestObjectRequester. | 271 | newID = SynchronousRestObjectRequester. |
221 | MakeRequest<AssetBase, string>("POST", uri, asset); | 272 | MakeRequest<AssetBase, string>("POST", uri, asset, 25); |
273 | if (newID == null || newID == "") | ||
274 | { | ||
275 | newID = UUID.Zero.ToString(); | ||
276 | } | ||
222 | } | 277 | } |
223 | catch (Exception e) | 278 | catch (Exception e) |
224 | { | 279 | { |
225 | m_log.WarnFormat("[ASSET CONNECTOR]: Unable to send asset {0} to asset server. Reason: {1}", asset.ID, e.Message); | 280 | newID = UUID.Zero.ToString(); |
226 | } | 281 | } |
227 | 282 | ||
228 | if (newID != String.Empty) | 283 | if (newID == UUID.Zero.ToString()) |
229 | { | 284 | { |
230 | // Placing this here, so that this work with old asset servers that don't send any reply back | 285 | //The asset upload failed, put it in a queue for later |
231 | // SynchronousRestObjectRequester returns somethins that is not an empty string | 286 | asset.UploadAttempts++; |
232 | if (newID != null) | 287 | if (asset.UploadAttempts > 30) |
233 | asset.ID = newID; | 288 | { |
234 | 289 | //By this stage we've been in the queue for a good few hours; | |
235 | if (m_Cache != null) | 290 | //We're going to drop the asset. |
236 | m_Cache.Cache(asset); | 291 | m_log.ErrorFormat("[Assets] Dropping asset {0} - Upload has been in the queue for too long.", asset.ID.ToString()); |
292 | } | ||
293 | else | ||
294 | { | ||
295 | if (!m_retryQueue.ContainsKey(asset.UploadAttempts)) | ||
296 | { | ||
297 | m_retryQueue.Add(asset.UploadAttempts, new List<AssetBase>()); | ||
298 | } | ||
299 | List<AssetBase> m_queue = m_retryQueue[asset.UploadAttempts]; | ||
300 | m_queue.Add(asset); | ||
301 | m_log.WarnFormat("[Assets] Upload failed: {0} - Requeuing asset for another run.", asset.ID.ToString()); | ||
302 | m_retryTimer.Start(); | ||
303 | } | ||
304 | } | ||
305 | else | ||
306 | { | ||
307 | if (asset.UploadAttempts > 0) | ||
308 | { | ||
309 | m_log.InfoFormat("[Assets] Upload of {0} succeeded after {1} failed attempts", asset.ID.ToString(), asset.UploadAttempts.ToString()); | ||
310 | } | ||
311 | if (newID != String.Empty) | ||
312 | { | ||
313 | // Placing this here, so that this work with old asset servers that don't send any reply back | ||
314 | // SynchronousRestObjectRequester returns somethins that is not an empty string | ||
315 | if (newID != null) | ||
316 | asset.ID = newID; | ||
317 | |||
318 | if (m_Cache != null) | ||
319 | m_Cache.Cache(asset); | ||
320 | } | ||
237 | } | 321 | } |
238 | return newID; | 322 | return asset.ID; |
239 | } | 323 | } |
240 | 324 | ||
241 | public bool UpdateContent(string id, byte[] data) | 325 | public bool UpdateContent(string id, byte[] data) |
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 8ab323a..1aa3282 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -158,17 +158,10 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
158 | try | 158 | try |
159 | { | 159 | { |
160 | WebClient c = new WebClient(); | 160 | WebClient c = new WebClient(); |
161 | //m_log.Debug("JPEG: " + imageURL); | ||
161 | string name = regionID.ToString(); | 162 | string name = regionID.ToString(); |
162 | filename = Path.Combine(storagePath, name + ".jpg"); | 163 | filename = Path.Combine(storagePath, name + ".jpg"); |
163 | m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: Map image at {0}, cached at {1}", imageURL, filename); | 164 | c.DownloadFile(imageURL, filename); |
164 | if (!File.Exists(filename)) | ||
165 | { | ||
166 | m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: downloading..."); | ||
167 | c.DownloadFile(imageURL, filename); | ||
168 | } | ||
169 | else | ||
170 | m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: using cached image"); | ||
171 | |||
172 | bitmap = new Bitmap(filename); | 165 | bitmap = new Bitmap(filename); |
173 | //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); | 166 | //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); |
174 | byte[] imageData = OpenJPEG.EncodeFromImage(bitmap, true); | 167 | byte[] imageData = OpenJPEG.EncodeFromImage(bitmap, true); |
@@ -179,11 +172,10 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
179 | 172 | ||
180 | ass.Data = imageData; | 173 | ass.Data = imageData; |
181 | 174 | ||
182 | mapTile = ass.FullID; | ||
183 | |||
184 | // finally | ||
185 | m_AssetService.Store(ass); | 175 | m_AssetService.Store(ass); |
186 | 176 | ||
177 | // finally | ||
178 | mapTile = ass.FullID; | ||
187 | } | 179 | } |
188 | catch // LEGIT: Catching problems caused by OpenJPEG p/invoke | 180 | catch // LEGIT: Catching problems caused by OpenJPEG p/invoke |
189 | { | 181 | { |
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index c40a347..7ddcfa6 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
@@ -60,9 +60,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
60 | { | 60 | { |
61 | Uri m_Uri = new Uri(m_ServerURL); | 61 | Uri m_Uri = new Uri(m_ServerURL); |
62 | IPAddress ip = Util.GetHostFromDNS(m_Uri.Host); | 62 | IPAddress ip = Util.GetHostFromDNS(m_Uri.Host); |
63 | m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString()); | 63 | m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString()); ; |
64 | if (!m_ServerURL.EndsWith("/")) | ||
65 | m_ServerURL += "/"; | ||
66 | } | 64 | } |
67 | catch (Exception e) | 65 | catch (Exception e) |
68 | { | 66 | { |
@@ -89,8 +87,6 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
89 | throw new Exception("UserAgent connector init error"); | 87 | throw new Exception("UserAgent connector init error"); |
90 | } | 88 | } |
91 | m_ServerURL = serviceURI; | 89 | m_ServerURL = serviceURI; |
92 | if (!m_ServerURL.EndsWith("/")) | ||
93 | m_ServerURL += "/"; | ||
94 | 90 | ||
95 | m_log.DebugFormat("[USER AGENT CONNECTOR]: UserAgentServiceConnector started for {0}", m_ServerURL); | 91 | m_log.DebugFormat("[USER AGENT CONNECTOR]: UserAgentServiceConnector started for {0}", m_ServerURL); |
96 | } | 92 | } |
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs index 252f7a1..ba39c99 100644 --- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs | |||
@@ -131,4 +131,4 @@ namespace OpenSim.Services.Connectors | |||
131 | return landData; | 131 | return landData; |
132 | } | 132 | } |
133 | } | 133 | } |
134 | } \ No newline at end of file | 134 | } |
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs index 41ebeaf..f1c99ce 100644 --- a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs | |||
@@ -300,6 +300,17 @@ namespace OpenSim.Services.Connectors | |||
300 | { | 300 | { |
301 | pinfo = new PresenceInfo((Dictionary<string, object>)replyData["result"]); | 301 | pinfo = new PresenceInfo((Dictionary<string, object>)replyData["result"]); |
302 | } | 302 | } |
303 | else | ||
304 | { | ||
305 | if (replyData["result"].ToString() == "null") | ||
306 | return null; | ||
307 | |||
308 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply (result not dictionary) received from presence server when querying for sessionID {0}", sessionID.ToString()); | ||
309 | } | ||
310 | } | ||
311 | else | ||
312 | { | ||
313 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply received from presence server when querying for sessionID {0}", sessionID.ToString()); | ||
303 | } | 314 | } |
304 | 315 | ||
305 | return pinfo; | 316 | return pinfo; |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs deleted file mode 100644 index dd8fe2b..0000000 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs +++ /dev/null | |||
@@ -1,261 +0,0 @@ | |||
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 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Reflection; | ||
31 | using System.Net; | ||
32 | using System.IO; | ||
33 | using System.Timers; | ||
34 | using System.Drawing; | ||
35 | using System.Drawing.Imaging; | ||
36 | |||
37 | using log4net; | ||
38 | using Mono.Addins; | ||
39 | using Nini.Config; | ||
40 | using OpenSim.Framework; | ||
41 | using OpenSim.Region.Framework.Interfaces; | ||
42 | using OpenSim.Region.Framework.Scenes; | ||
43 | using OpenMetaverse; | ||
44 | using OpenMetaverse.StructuredData; | ||
45 | |||
46 | namespace OpenSim.Region.OptionalModules.Simian | ||
47 | { | ||
48 | /// <summary> | ||
49 | /// </summary> | ||
50 | /// <remarks> | ||
51 | /// </remarks> | ||
52 | |||
53 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianGridMaptile")] | ||
54 | public class SimianGridMaptile : ISharedRegionModule | ||
55 | { | ||
56 | private static readonly ILog m_log = | ||
57 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
58 | |||
59 | private bool m_enabled = false; | ||
60 | private string m_serverUrl = String.Empty; | ||
61 | private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); | ||
62 | |||
63 | private int m_refreshtime = 0; | ||
64 | private int m_lastrefresh = 0; | ||
65 | private System.Timers.Timer m_refreshTimer = new System.Timers.Timer(); | ||
66 | |||
67 | #region ISharedRegionModule | ||
68 | |||
69 | public Type ReplaceableInterface { get { return null; } } | ||
70 | public string Name { get { return "SimianGridMaptile"; } } | ||
71 | public void RegionLoaded(Scene scene) { } | ||
72 | public void Close() { } | ||
73 | |||
74 | ///<summary> | ||
75 | /// | ||
76 | ///</summary> | ||
77 | public void Initialise(IConfigSource source) | ||
78 | { | ||
79 | IConfig config = source.Configs["SimianGridMaptiles"]; | ||
80 | if (config == null) | ||
81 | return; | ||
82 | |||
83 | if (! config.GetBoolean("Enabled", false)) | ||
84 | return; | ||
85 | |||
86 | m_serverUrl = config.GetString("MaptileURL"); | ||
87 | if (String.IsNullOrEmpty(m_serverUrl)) | ||
88 | return; | ||
89 | |||
90 | m_refreshtime = Convert.ToInt32(config.GetString("RefreshTime")); | ||
91 | if (m_refreshtime <= 0) | ||
92 | return; | ||
93 | |||
94 | m_log.InfoFormat("[SIMIAN MAPTILE] enabled with refresh timeout {0} and URL {1}", | ||
95 | m_refreshtime,m_serverUrl); | ||
96 | |||
97 | m_enabled = true; | ||
98 | } | ||
99 | |||
100 | ///<summary> | ||
101 | /// | ||
102 | ///</summary> | ||
103 | public void PostInitialise() | ||
104 | { | ||
105 | if (m_enabled) | ||
106 | { | ||
107 | m_refreshTimer.Enabled = true; | ||
108 | m_refreshTimer.AutoReset = true; | ||
109 | m_refreshTimer.Interval = 5 * 60 * 1000; // every 5 minutes | ||
110 | m_refreshTimer.Elapsed += new ElapsedEventHandler(HandleMaptileRefresh); | ||
111 | } | ||
112 | } | ||
113 | |||
114 | |||
115 | ///<summary> | ||
116 | /// | ||
117 | ///</summary> | ||
118 | public void AddRegion(Scene scene) | ||
119 | { | ||
120 | if (! m_enabled) | ||
121 | return; | ||
122 | |||
123 | // Every shared region module has to maintain an indepedent list of | ||
124 | // currently running regions | ||
125 | lock (m_scenes) | ||
126 | m_scenes[scene.RegionInfo.RegionID] = scene; | ||
127 | } | ||
128 | |||
129 | ///<summary> | ||
130 | /// | ||
131 | ///</summary> | ||
132 | public void RemoveRegion(Scene scene) | ||
133 | { | ||
134 | if (! m_enabled) | ||
135 | return; | ||
136 | |||
137 | lock (m_scenes) | ||
138 | m_scenes.Remove(scene.RegionInfo.RegionID); | ||
139 | } | ||
140 | |||
141 | #endregion ISharedRegionModule | ||
142 | |||
143 | ///<summary> | ||
144 | /// | ||
145 | ///</summary> | ||
146 | private void HandleMaptileRefresh(object sender, EventArgs ea) | ||
147 | { | ||
148 | // this approach is a bit convoluted becase we want to wait for the | ||
149 | // first upload to happen on startup but after all the objects are | ||
150 | // loaded and initialized | ||
151 | if (m_lastrefresh > 0 && Util.EnvironmentTickCountSubtract(m_lastrefresh) < m_refreshtime) | ||
152 | return; | ||
153 | |||
154 | m_log.DebugFormat("[SIMIAN MAPTILE] map refresh fired"); | ||
155 | lock (m_scenes) | ||
156 | { | ||
157 | foreach (IScene scene in m_scenes.Values) | ||
158 | { | ||
159 | try | ||
160 | { | ||
161 | UploadMapTile(scene); | ||
162 | } | ||
163 | catch (Exception ex) | ||
164 | { | ||
165 | m_log.WarnFormat("[SIMIAN MAPTILE] something bad happened {0}",ex.Message); | ||
166 | } | ||
167 | } | ||
168 | } | ||
169 | |||
170 | m_lastrefresh = Util.EnvironmentTickCount(); | ||
171 | } | ||
172 | |||
173 | ///<summary> | ||
174 | /// | ||
175 | ///</summary> | ||
176 | private void UploadMapTile(IScene scene) | ||
177 | { | ||
178 | m_log.DebugFormat("[SIMIAN MAPTILE]: upload maptile for {0}",scene.RegionInfo.RegionName); | ||
179 | |||
180 | // Create a PNG map tile and upload it to the AddMapTile API | ||
181 | byte[] pngData = Utils.EmptyBytes; | ||
182 | IMapImageGenerator tileGenerator = scene.RequestModuleInterface<IMapImageGenerator>(); | ||
183 | if (tileGenerator == null) | ||
184 | { | ||
185 | m_log.Warn("[SIMIAN MAPTILE]: Cannot upload PNG map tile without an ImageGenerator"); | ||
186 | return; | ||
187 | } | ||
188 | |||
189 | using (Image mapTile = tileGenerator.CreateMapTile()) | ||
190 | { | ||
191 | using (MemoryStream stream = new MemoryStream()) | ||
192 | { | ||
193 | mapTile.Save(stream, ImageFormat.Png); | ||
194 | pngData = stream.ToArray(); | ||
195 | } | ||
196 | } | ||
197 | |||
198 | List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>() | ||
199 | { | ||
200 | new MultipartForm.Parameter("X", scene.RegionInfo.RegionLocX.ToString()), | ||
201 | new MultipartForm.Parameter("Y", scene.RegionInfo.RegionLocY.ToString()), | ||
202 | new MultipartForm.File("Tile", "tile.png", "image/png", pngData) | ||
203 | }; | ||
204 | |||
205 | string errorMessage = null; | ||
206 | int tickstart = Util.EnvironmentTickCount(); | ||
207 | |||
208 | // Make the remote storage request | ||
209 | try | ||
210 | { | ||
211 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl); | ||
212 | request.Timeout = 20000; | ||
213 | request.ReadWriteTimeout = 5000; | ||
214 | |||
215 | using (HttpWebResponse response = MultipartForm.Post(request, postParameters)) | ||
216 | { | ||
217 | using (Stream responseStream = response.GetResponseStream()) | ||
218 | { | ||
219 | string responseStr = responseStream.GetStreamString(); | ||
220 | OSD responseOSD = OSDParser.Deserialize(responseStr); | ||
221 | if (responseOSD.Type == OSDType.Map) | ||
222 | { | ||
223 | OSDMap responseMap = (OSDMap)responseOSD; | ||
224 | if (responseMap["Success"].AsBoolean()) | ||
225 | return; | ||
226 | |||
227 | errorMessage = "Upload failed: " + responseMap["Message"].AsString(); | ||
228 | } | ||
229 | else | ||
230 | { | ||
231 | errorMessage = "Response format was invalid:\n" + responseStr; | ||
232 | } | ||
233 | } | ||
234 | } | ||
235 | } | ||
236 | catch (WebException we) | ||
237 | { | ||
238 | errorMessage = we.Message; | ||
239 | if (we.Status == WebExceptionStatus.ProtocolError) | ||
240 | { | ||
241 | HttpWebResponse webResponse = (HttpWebResponse)we.Response; | ||
242 | errorMessage = String.Format("[{0}] {1}", | ||
243 | webResponse.StatusCode,webResponse.StatusDescription); | ||
244 | } | ||
245 | } | ||
246 | catch (Exception ex) | ||
247 | { | ||
248 | errorMessage = ex.Message; | ||
249 | } | ||
250 | finally | ||
251 | { | ||
252 | // This just dumps a warning for any operation that takes more than 100 ms | ||
253 | int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); | ||
254 | m_log.DebugFormat("[SIMIAN MAPTILE]: map tile uploaded in {0}ms",tickdiff); | ||
255 | } | ||
256 | |||
257 | m_log.WarnFormat("[SIMIAN MAPTILE]: Failed to store {0} byte tile for {1}: {2}", | ||
258 | pngData.Length, scene.RegionInfo.RegionName, errorMessage); | ||
259 | } | ||
260 | } | ||
261 | } \ No newline at end of file | ||
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index 918544f..feea196 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -28,6 +28,8 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Collections.Specialized; | 30 | using System.Collections.Specialized; |
31 | using System.Drawing; | ||
32 | using System.Drawing.Imaging; | ||
31 | using System.IO; | 33 | using System.IO; |
32 | using System.Net; | 34 | using System.Net; |
33 | using System.Reflection; | 35 | using System.Reflection; |
@@ -100,6 +102,15 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
100 | 102 | ||
101 | public string RegisterRegion(UUID scopeID, GridRegion regionInfo) | 103 | public string RegisterRegion(UUID scopeID, GridRegion regionInfo) |
102 | { | 104 | { |
105 | IPEndPoint ext = regionInfo.ExternalEndPoint; | ||
106 | if (ext == null) return "Region registration for " + regionInfo.RegionName + " failed: Could not resolve EndPoint"; | ||
107 | // Generate and upload our map tile in PNG format to the SimianGrid AddMapTile service | ||
108 | // Scene scene; | ||
109 | // if (m_scenes.TryGetValue(regionInfo.RegionID, out scene)) | ||
110 | // UploadMapTile(scene); | ||
111 | // else | ||
112 | // m_log.Warn("Registering region " + regionInfo.RegionName + " (" + regionInfo.RegionID + ") that we are not tracking"); | ||
113 | |||
103 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); | 114 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); |
104 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); | 115 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); |
105 | 116 | ||
@@ -108,7 +119,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
108 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, | 119 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, |
109 | { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) }, | 120 | { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) }, |
110 | { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) }, | 121 | { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) }, |
111 | { "ExternalAddress", OSD.FromString(regionInfo.ExternalEndPoint.Address.ToString()) }, | 122 | { "ExternalAddress", OSD.FromString(ext.Address.ToString()) }, |
112 | { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) }, | 123 | { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) }, |
113 | { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) }, | 124 | { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) }, |
114 | { "Access", OSD.FromInteger(regionInfo.Access) }, | 125 | { "Access", OSD.FromInteger(regionInfo.Access) }, |
@@ -371,6 +382,83 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
371 | 382 | ||
372 | #endregion IGridService | 383 | #endregion IGridService |
373 | 384 | ||
385 | private void UploadMapTile(IScene scene) | ||
386 | { | ||
387 | string errorMessage = null; | ||
388 | |||
389 | // Create a PNG map tile and upload it to the AddMapTile API | ||
390 | byte[] pngData = Utils.EmptyBytes; | ||
391 | IMapImageGenerator tileGenerator = scene.RequestModuleInterface<IMapImageGenerator>(); | ||
392 | if (tileGenerator == null) | ||
393 | { | ||
394 | m_log.Warn("[SIMIAN GRID CONNECTOR]: Cannot upload PNG map tile without an IMapImageGenerator"); | ||
395 | return; | ||
396 | } | ||
397 | |||
398 | using (Image mapTile = tileGenerator.CreateMapTile()) | ||
399 | { | ||
400 | using (MemoryStream stream = new MemoryStream()) | ||
401 | { | ||
402 | mapTile.Save(stream, ImageFormat.Png); | ||
403 | pngData = stream.ToArray(); | ||
404 | } | ||
405 | } | ||
406 | |||
407 | List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>() | ||
408 | { | ||
409 | new MultipartForm.Parameter("X", scene.RegionInfo.RegionLocX.ToString()), | ||
410 | new MultipartForm.Parameter("Y", scene.RegionInfo.RegionLocY.ToString()), | ||
411 | new MultipartForm.File("Tile", "tile.png", "image/png", pngData) | ||
412 | }; | ||
413 | |||
414 | // Make the remote storage request | ||
415 | try | ||
416 | { | ||
417 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI); | ||
418 | |||
419 | HttpWebResponse response = MultipartForm.Post(request, postParameters); | ||
420 | using (Stream responseStream = response.GetResponseStream()) | ||
421 | { | ||
422 | string responseStr = null; | ||
423 | |||
424 | try | ||
425 | { | ||
426 | responseStr = responseStream.GetStreamString(); | ||
427 | OSD responseOSD = OSDParser.Deserialize(responseStr); | ||
428 | if (responseOSD.Type == OSDType.Map) | ||
429 | { | ||
430 | OSDMap responseMap = (OSDMap)responseOSD; | ||
431 | if (responseMap["Success"].AsBoolean()) | ||
432 | m_log.Info("[SIMIAN GRID CONNECTOR]: Uploaded " + pngData.Length + " byte PNG map tile to AddMapTile"); | ||
433 | else | ||
434 | errorMessage = "Upload failed: " + responseMap["Message"].AsString(); | ||
435 | } | ||
436 | else | ||
437 | { | ||
438 | errorMessage = "Response format was invalid:\n" + responseStr; | ||
439 | } | ||
440 | } | ||
441 | catch (Exception ex) | ||
442 | { | ||
443 | if (!String.IsNullOrEmpty(responseStr)) | ||
444 | errorMessage = "Failed to parse the response:\n" + responseStr; | ||
445 | else | ||
446 | errorMessage = "Failed to retrieve the response: " + ex.Message; | ||
447 | } | ||
448 | } | ||
449 | } | ||
450 | catch (WebException ex) | ||
451 | { | ||
452 | errorMessage = ex.Message; | ||
453 | } | ||
454 | |||
455 | if (!String.IsNullOrEmpty(errorMessage)) | ||
456 | { | ||
457 | m_log.WarnFormat("[SIMIAN GRID CONNECTOR]: Failed to store {0} byte PNG map tile for {1}: {2}", | ||
458 | pngData.Length, scene.RegionInfo.RegionName, errorMessage.Replace('\n', ' ')); | ||
459 | } | ||
460 | } | ||
461 | |||
374 | private GridRegion GetNearestRegion(Vector3d position, bool onlyEnabled) | 462 | private GridRegion GetNearestRegion(Vector3d position, bool onlyEnabled) |
375 | { | 463 | { |
376 | NameValueCollection requestArgs = new NameValueCollection | 464 | NameValueCollection requestArgs = new NameValueCollection |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index 91e2976..801b424 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
@@ -191,6 +191,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
191 | return accounts; | 191 | return accounts; |
192 | } | 192 | } |
193 | 193 | ||
194 | public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query) | ||
195 | { | ||
196 | return null; | ||
197 | } | ||
198 | |||
194 | public bool StoreUserAccount(UserAccount data) | 199 | public bool StoreUserAccount(UserAccount data) |
195 | { | 200 | { |
196 | // m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name); | 201 | // m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name); |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 775bded..752d552 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -251,9 +251,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
251 | return true; | 251 | return true; |
252 | } | 252 | } |
253 | 253 | ||
254 | /// <summary> | 254 | private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly) |
255 | /// </summary> | ||
256 | public bool CloseAgent(GridRegion destination, UUID id) | ||
257 | { | 255 | { |
258 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); | 256 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); |
259 | 257 | ||
@@ -271,6 +269,16 @@ namespace OpenSim.Services.Connectors.Simulation | |||
271 | return true; | 269 | return true; |
272 | } | 270 | } |
273 | 271 | ||
272 | public bool CloseChildAgent(GridRegion destination, UUID id) | ||
273 | { | ||
274 | return CloseAgent(destination, id, true); | ||
275 | } | ||
276 | |||
277 | public bool CloseAgent(GridRegion destination, UUID id) | ||
278 | { | ||
279 | return CloseAgent(destination, id, false); | ||
280 | } | ||
281 | |||
274 | #endregion Agents | 282 | #endregion Agents |
275 | 283 | ||
276 | #region Objects | 284 | #region Objects |
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs index 2a5df83..205a4aa 100644 --- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs | |||
@@ -187,6 +187,11 @@ namespace OpenSim.Services.Connectors | |||
187 | return accounts; | 187 | return accounts; |
188 | } | 188 | } |
189 | 189 | ||
190 | public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where) | ||
191 | { | ||
192 | return null; // Not implemented for regions | ||
193 | } | ||
194 | |||
190 | public virtual bool StoreUserAccount(UserAccount data) | 195 | public virtual bool StoreUserAccount(UserAccount data) |
191 | { | 196 | { |
192 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 197 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |