diff options
author | John Hurliman | 2010-03-26 15:13:55 -0700 |
---|---|---|
committer | John Hurliman | 2010-03-26 15:13:55 -0700 |
commit | 1430441cf32c659502c6ed1bd7fd54e55a107c05 (patch) | |
tree | 23e3e318fc2b043e1f5ec9c8dc3dee436b8fbfa1 /OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.zip opensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.gz opensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.bz2 opensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.xz |
Change the SimianGrid connector log messages to start with "[SIMIAN " to avoid configuration confusion
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index c5fbc9e..27434ad 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -90,14 +90,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
90 | IConfig gridConfig = source.Configs["AssetService"]; | 90 | IConfig gridConfig = source.Configs["AssetService"]; |
91 | if (gridConfig == null) | 91 | if (gridConfig == null) |
92 | { | 92 | { |
93 | m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini"); | 93 | m_log.Error("[SIMIAN ASSET CONNECTOR]: AssetService missing from OpenSim.ini"); |
94 | throw new Exception("Asset connector init error"); | 94 | throw new Exception("Asset connector init error"); |
95 | } | 95 | } |
96 | 96 | ||
97 | string serviceUrl = gridConfig.GetString("AssetServerURI"); | 97 | string serviceUrl = gridConfig.GetString("AssetServerURI"); |
98 | if (String.IsNullOrEmpty(serviceUrl)) | 98 | if (String.IsNullOrEmpty(serviceUrl)) |
99 | { | 99 | { |
100 | m_log.Error("[ASSET CONNECTOR]: No AssetServerURI in section AssetService"); | 100 | m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI in section AssetService"); |
101 | throw new Exception("Asset connector init error"); | 101 | throw new Exception("Asset connector init error"); |
102 | } | 102 | } |
103 | 103 | ||
@@ -162,7 +162,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
162 | } | 162 | } |
163 | catch (Exception ex) | 163 | catch (Exception ex) |
164 | { | 164 | { |
165 | m_log.Warn("[ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); | 165 | m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); |
166 | return null; | 166 | return null; |
167 | } | 167 | } |
168 | } | 168 | } |
@@ -220,7 +220,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
220 | } | 220 | } |
221 | catch (Exception ex) | 221 | catch (Exception ex) |
222 | { | 222 | { |
223 | m_log.Warn("[ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); | 223 | m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); |
224 | } | 224 | } |
225 | 225 | ||
226 | return metadata; | 226 | return metadata; |
@@ -356,7 +356,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
356 | errorMessage = ex.Message; | 356 | errorMessage = ex.Message; |
357 | } | 357 | } |
358 | 358 | ||
359 | m_log.WarnFormat("[ASSET CONNECTOR]: Failed to store asset \"{0}\" ({1}, {2}): {3}", | 359 | m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: Failed to store asset \"{0}\" ({1}, {2}): {3}", |
360 | asset.Name, asset.ID, asset.Metadata.ContentType, errorMessage); | 360 | asset.Name, asset.ID, asset.Metadata.ContentType, errorMessage); |
361 | return null; | 361 | return null; |
362 | } | 362 | } |
@@ -374,7 +374,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
374 | 374 | ||
375 | if (asset == null) | 375 | if (asset == null) |
376 | { | 376 | { |
377 | m_log.Warn("[ASSET CONNECTOR]: Failed to fetch asset " + id + " for updating"); | 377 | m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to fetch asset " + id + " for updating"); |
378 | return false; | 378 | return false; |
379 | } | 379 | } |
380 | 380 | ||
@@ -400,7 +400,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
400 | if (response["Success"].AsBoolean()) | 400 | if (response["Success"].AsBoolean()) |
401 | return true; | 401 | return true; |
402 | else | 402 | else |
403 | m_log.Warn("[ASSET CONNECTOR]: Failed to delete asset " + id + " from the asset service"); | 403 | m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to delete asset " + id + " from the asset service"); |
404 | 404 | ||
405 | return false; | 405 | return false; |
406 | } | 406 | } |