diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs | 16 | ||||
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs | 20 |
2 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs index 384f5f0..26c34e9 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
83 | } | 83 | } |
84 | catch (Exception ex) | 84 | catch (Exception ex) |
85 | { | 85 | { |
86 | m_log.ErrorFormat("Failed reading data for asset {0} from {1}: {2}", assetID, filename, ex.Message); | 86 | m_log.ErrorFormat("[SIMPLEASSETSTORAGE]: Failed reading data for asset {0} from {1}: {2}", assetID, filename, ex.Message); |
87 | ret = BackendResponse.Failure; | 87 | ret = BackendResponse.Failure; |
88 | } | 88 | } |
89 | } | 89 | } |
@@ -114,7 +114,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
114 | } | 114 | } |
115 | catch (Exception ex) | 115 | catch (Exception ex) |
116 | { | 116 | { |
117 | m_log.ErrorFormat("Failed reading data for asset {0} from {1}: {2}", assetID, filename, ex.Message); | 117 | m_log.ErrorFormat("[SIMPLEASSETSTORAGE]: Failed reading data for asset {0} from {1}: {2}", assetID, filename, ex.Message); |
118 | ret = BackendResponse.Failure; | 118 | ret = BackendResponse.Failure; |
119 | } | 119 | } |
120 | 120 | ||
@@ -165,7 +165,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
165 | } | 165 | } |
166 | catch (Exception ex) | 166 | catch (Exception ex) |
167 | { | 167 | { |
168 | m_log.ErrorFormat("Failed writing data for asset {0} to {1}: {2}", asset.FullID, filename, ex.Message); | 168 | m_log.ErrorFormat("[SIMPLEASSETSTORAGE]: Failed writing data for asset {0} to {1}: {2}", asset.FullID, filename, ex.Message); |
169 | ret = BackendResponse.Failure; | 169 | ret = BackendResponse.Failure; |
170 | } | 170 | } |
171 | 171 | ||
@@ -203,7 +203,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
203 | LoadFiles(DEFAULT_DATA_DIR, false); | 203 | LoadFiles(DEFAULT_DATA_DIR, false); |
204 | LoadFiles(TEMP_DATA_DIR, true); | 204 | LoadFiles(TEMP_DATA_DIR, true); |
205 | 205 | ||
206 | m_log.InfoFormat("Initialized the store index with metadata for {0} assets", | 206 | m_log.InfoFormat("[SIMPLEASSETSTORAGE]: Initialized the store index with metadata for {0} assets", |
207 | metadataStorage.Count); | 207 | metadataStorage.Count); |
208 | } | 208 | } |
209 | 209 | ||
@@ -212,7 +212,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
212 | /// </summary> | 212 | /// </summary> |
213 | public void Initialise() | 213 | public void Initialise() |
214 | { | 214 | { |
215 | m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); | 215 | m_log.InfoFormat("[SIMPLEASSETSTORAGE]: {0} cannot be default-initialized!", Name); |
216 | throw new PluginNotInitialisedException(Name); | 216 | throw new PluginNotInitialisedException(Name); |
217 | } | 217 | } |
218 | 218 | ||
@@ -239,7 +239,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
239 | if (Directory.Exists(TEMP_DATA_DIR)) | 239 | if (Directory.Exists(TEMP_DATA_DIR)) |
240 | { | 240 | { |
241 | try { Directory.Delete(TEMP_DATA_DIR); } | 241 | try { Directory.Delete(TEMP_DATA_DIR); } |
242 | catch (Exception ex) { m_log.Error(ex.Message); } | 242 | catch (Exception ex) { m_log.Error("[SIMPLEASSETSTORAGE]: " + ex.Message); } |
243 | } | 243 | } |
244 | } | 244 | } |
245 | 245 | ||
@@ -251,7 +251,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
251 | try { Directory.CreateDirectory(folder); } | 251 | try { Directory.CreateDirectory(folder); } |
252 | catch (Exception ex) | 252 | catch (Exception ex) |
253 | { | 253 | { |
254 | m_log.Warn(ex.Message); | 254 | m_log.Warn("[SIMPLEASSETSTORAGE]: " + ex.Message); |
255 | return; | 255 | return; |
256 | } | 256 | } |
257 | } | 257 | } |
@@ -283,7 +283,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
283 | } | 283 | } |
284 | catch (Exception ex) | 284 | catch (Exception ex) |
285 | { | 285 | { |
286 | m_log.Warn(ex.Message); | 286 | m_log.Warn("[SIMPLEASSETSTORAGE]: " + ex.Message); |
287 | } | 287 | } |
288 | } | 288 | } |
289 | } | 289 | } |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs index e317ae3..fee8837 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs | |||
@@ -210,7 +210,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
210 | } | 210 | } |
211 | catch (Exception ex) | 211 | catch (Exception ex) |
212 | { | 212 | { |
213 | m_log.Error(ex.Message); | 213 | m_log.Error("[SIMPLEINVENTORYSTORAGE]: " + ex.Message); |
214 | ret = BackendResponse.Failure; | 214 | ret = BackendResponse.Failure; |
215 | } | 215 | } |
216 | } | 216 | } |
@@ -252,7 +252,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
252 | } | 252 | } |
253 | catch (Exception ex) | 253 | catch (Exception ex) |
254 | { | 254 | { |
255 | m_log.Error(ex.Message); | 255 | m_log.Error("[SIMPLEINVENTORYSTORAGE]: " + ex.Message); |
256 | ret = BackendResponse.Failure; | 256 | ret = BackendResponse.Failure; |
257 | } | 257 | } |
258 | } | 258 | } |
@@ -306,7 +306,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
306 | } | 306 | } |
307 | catch (Exception ex) | 307 | catch (Exception ex) |
308 | { | 308 | { |
309 | m_log.Error(ex.Message); | 309 | m_log.Error("[SIMPLEINVENTORYSTORAGE]: " + ex.Message); |
310 | ret = BackendResponse.Failure; | 310 | ret = BackendResponse.Failure; |
311 | } | 311 | } |
312 | } | 312 | } |
@@ -354,7 +354,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
354 | foreach (string match in matches) | 354 | foreach (string match in matches) |
355 | { | 355 | { |
356 | try { File.Delete(match); } | 356 | try { File.Delete(match); } |
357 | catch (Exception ex) { m_log.ErrorFormat("Failed to delete file {0}: {1}", match, ex.Message); } | 357 | catch (Exception ex) { m_log.ErrorFormat("[SIMPLEINVENTORYSTORAGE]: Failed to delete file {0}: {1}", match, ex.Message); } |
358 | } | 358 | } |
359 | 359 | ||
360 | ret = BackendResponse.Success; | 360 | ret = BackendResponse.Success; |
@@ -391,7 +391,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
391 | foreach (string match in matches) | 391 | foreach (string match in matches) |
392 | { | 392 | { |
393 | try { File.Delete(match); } | 393 | try { File.Delete(match); } |
394 | catch (Exception ex) { m_log.ErrorFormat("Failed to delete folder file {0}: {1}", match, ex.Message); } | 394 | catch (Exception ex) { m_log.ErrorFormat("[SIMPLEINVENTORYSTORAGE]: Failed to delete folder file {0}: {1}", match, ex.Message); } |
395 | } | 395 | } |
396 | 396 | ||
397 | ret = BackendResponse.Success; | 397 | ret = BackendResponse.Success; |
@@ -502,7 +502,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
502 | try { Directory.CreateDirectory(folder); } | 502 | try { Directory.CreateDirectory(folder); } |
503 | catch (Exception ex) | 503 | catch (Exception ex) |
504 | { | 504 | { |
505 | m_log.Warn(ex.Message); | 505 | m_log.Warn("[SIMPLEINVENTORYSTORAGE]: " + ex.Message); |
506 | return; | 506 | return; |
507 | } | 507 | } |
508 | } | 508 | } |
@@ -526,7 +526,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
526 | } | 526 | } |
527 | catch (Exception ex) | 527 | catch (Exception ex) |
528 | { | 528 | { |
529 | m_log.WarnFormat("Failed loading the index file {0}: {1}", indexPath, ex.Message); | 529 | m_log.WarnFormat("[SIMPLEINVENTORYSTORAGE]: Failed loading the index file {0}: {1}", indexPath, ex.Message); |
530 | } | 530 | } |
531 | 531 | ||
532 | if (ownerID != UUID.Zero && owner != null) | 532 | if (ownerID != UUID.Zero && owner != null) |
@@ -582,7 +582,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
582 | } | 582 | } |
583 | catch (Exception ex) | 583 | catch (Exception ex) |
584 | { | 584 | { |
585 | m_log.ErrorFormat("Failed loading inventory from {0}: {1}", folder, ex.Message); | 585 | m_log.ErrorFormat("[SIMPLEINVENTORYSTORAGE]: Failed loading inventory from {0}: {1}", folder, ex.Message); |
586 | } | 586 | } |
587 | } | 587 | } |
588 | 588 | ||
@@ -594,7 +594,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
594 | 594 | ||
595 | LoadFiles(DEFAULT_INVENTORY_DIR); | 595 | LoadFiles(DEFAULT_INVENTORY_DIR); |
596 | 596 | ||
597 | m_log.InfoFormat("Initialized the inventory index with data for {0} avatars", | 597 | m_log.InfoFormat("[SIMPLEINVENTORYSTORAGE]: Initialized the inventory index with data for {0} avatars", |
598 | inventories.Count); | 598 | inventories.Count); |
599 | } | 599 | } |
600 | 600 | ||
@@ -603,7 +603,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.Simple | |||
603 | /// </summary> | 603 | /// </summary> |
604 | public void Initialise() | 604 | public void Initialise() |
605 | { | 605 | { |
606 | m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); | 606 | m_log.InfoFormat("[SIMPLEINVENTORYSTORAGE]: {0} cannot be default-initialized!", Name); |
607 | throw new PluginNotInitialisedException(Name); | 607 | throw new PluginNotInitialisedException(Name); |
608 | } | 608 | } |
609 | 609 | ||