diff options
Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index ee047e0..0996acb 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |||
@@ -39,7 +39,7 @@ using OpenMetaverse; | |||
39 | 39 | ||
40 | namespace OpenSim.Services.Connectors | 40 | namespace OpenSim.Services.Connectors |
41 | { | 41 | { |
42 | public class AssetServicesConnector : IAssetService | 42 | public class AssetServicesConnector : BaseServiceConnector, IAssetService |
43 | { | 43 | { |
44 | private static readonly ILog m_log = | 44 | private static readonly ILog m_log = |
45 | LogManager.GetLogger( | 45 | LogManager.GetLogger( |
@@ -71,6 +71,7 @@ namespace OpenSim.Services.Connectors | |||
71 | } | 71 | } |
72 | 72 | ||
73 | public AssetServicesConnector(IConfigSource source) | 73 | public AssetServicesConnector(IConfigSource source) |
74 | : base(source, "AssetService") | ||
74 | { | 75 | { |
75 | Initialise(source); | 76 | Initialise(source); |
76 | } | 77 | } |
@@ -117,8 +118,16 @@ namespace OpenSim.Services.Connectors | |||
117 | 118 | ||
118 | if (asset == null) | 119 | if (asset == null) |
119 | { | 120 | { |
120 | asset = SynchronousRestObjectRequester. | 121 | // XXX: Commented out for now since this has either never been properly operational or not for some time |
121 | MakeRequest<int, AssetBase>("GET", uri, 0, m_maxAssetRequestConcurrency); | 122 | // as m_maxAssetRequestConcurrency was being passed as the timeout, not a concurrency limiting option. |
123 | // Wasn't noticed before because timeout wasn't actually used. | ||
124 | // Not attempting concurrency setting for now as this omission was discovered in release candidate | ||
125 | // phase for OpenSimulator 0.8. Need to revisit afterwards. | ||
126 | // asset | ||
127 | // = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>( | ||
128 | // "GET", uri, 0, m_maxAssetRequestConcurrency); | ||
129 | |||
130 | asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, m_Auth); | ||
122 | 131 | ||
123 | if (m_Cache != null) | 132 | if (m_Cache != null) |
124 | m_Cache.Cache(asset); | 133 | m_Cache.Cache(asset); |
@@ -148,8 +157,7 @@ namespace OpenSim.Services.Connectors | |||
148 | 157 | ||
149 | string uri = m_ServerURI + "/assets/" + id + "/metadata"; | 158 | string uri = m_ServerURI + "/assets/" + id + "/metadata"; |
150 | 159 | ||
151 | AssetMetadata asset = SynchronousRestObjectRequester. | 160 | AssetMetadata asset = SynchronousRestObjectRequester.MakeRequest<int, AssetMetadata>("GET", uri, 0, m_Auth); |
152 | MakeRequest<int, AssetMetadata>("GET", uri, 0); | ||
153 | return asset; | 161 | return asset; |
154 | } | 162 | } |
155 | 163 | ||
@@ -170,7 +178,7 @@ namespace OpenSim.Services.Connectors | |||
170 | 178 | ||
171 | rc.RequestMethod = "GET"; | 179 | rc.RequestMethod = "GET"; |
172 | 180 | ||
173 | Stream s = rc.Request(); | 181 | Stream s = rc.Request(m_Auth); |
174 | 182 | ||
175 | if (s == null) | 183 | if (s == null) |
176 | return null; | 184 | return null; |
@@ -231,7 +239,7 @@ namespace OpenSim.Services.Connectors | |||
231 | m_AssetHandlers.Remove(id); | 239 | m_AssetHandlers.Remove(id); |
232 | } | 240 | } |
233 | handlers.Invoke(a); | 241 | handlers.Invoke(a); |
234 | }, m_maxAssetRequestConcurrency); | 242 | }, m_maxAssetRequestConcurrency, m_Auth); |
235 | 243 | ||
236 | success = true; | 244 | success = true; |
237 | } | 245 | } |
@@ -261,7 +269,7 @@ namespace OpenSim.Services.Connectors | |||
261 | bool[] exist = null; | 269 | bool[] exist = null; |
262 | try | 270 | try |
263 | { | 271 | { |
264 | exist = SynchronousRestObjectRequester.MakeRequest<string[], bool[]>("POST", uri, ids); | 272 | exist = SynchronousRestObjectRequester.MakeRequest<string[], bool[]>("POST", uri, ids, m_Auth); |
265 | } | 273 | } |
266 | catch (Exception) | 274 | catch (Exception) |
267 | { | 275 | { |
@@ -290,8 +298,7 @@ namespace OpenSim.Services.Connectors | |||
290 | string newID; | 298 | string newID; |
291 | try | 299 | try |
292 | { | 300 | { |
293 | newID = SynchronousRestObjectRequester. | 301 | newID = SynchronousRestObjectRequester.MakeRequest<AssetBase, string>("POST", uri, asset, m_Auth); |
294 | MakeRequest<AssetBase, string>("POST", uri, asset); | ||
295 | } | 302 | } |
296 | catch (Exception e) | 303 | catch (Exception e) |
297 | { | 304 | { |
@@ -337,8 +344,7 @@ namespace OpenSim.Services.Connectors | |||
337 | 344 | ||
338 | string uri = m_ServerURI + "/assets/" + id; | 345 | string uri = m_ServerURI + "/assets/" + id; |
339 | 346 | ||
340 | if (SynchronousRestObjectRequester. | 347 | if (SynchronousRestObjectRequester.MakeRequest<AssetBase, bool>("POST", uri, asset, m_Auth)) |
341 | MakeRequest<AssetBase, bool>("POST", uri, asset)) | ||
342 | { | 348 | { |
343 | if (m_Cache != null) | 349 | if (m_Cache != null) |
344 | m_Cache.Cache(asset); | 350 | m_Cache.Cache(asset); |
@@ -352,8 +358,7 @@ namespace OpenSim.Services.Connectors | |||
352 | { | 358 | { |
353 | string uri = m_ServerURI + "/assets/" + id; | 359 | string uri = m_ServerURI + "/assets/" + id; |
354 | 360 | ||
355 | if (SynchronousRestObjectRequester. | 361 | if (SynchronousRestObjectRequester.MakeRequest<int, bool>("DELETE", uri, 0, m_Auth)) |
356 | MakeRequest<int, bool>("DELETE", uri, 0)) | ||
357 | { | 362 | { |
358 | if (m_Cache != null) | 363 | if (m_Cache != null) |
359 | m_Cache.Expire(id); | 364 | m_Cache.Expire(id); |