aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetInventoryServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/AssetInventoryServer')
-rw-r--r--OpenSim/Grid/AssetInventoryServer/AssetInventoryConfig.cs4
-rw-r--r--OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs16
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs4
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs4
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs4
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs26
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs12
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs10
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs16
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs46
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs6
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs16
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs20
13 files changed, 92 insertions, 92 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/AssetInventoryConfig.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryConfig.cs
index ed56c75..d0f4250 100644
--- a/OpenSim/Grid/AssetInventoryServer/AssetInventoryConfig.cs
+++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryConfig.cs
@@ -55,8 +55,8 @@ namespace OpenSim.Grid.AssetInventoryServer
55 55
56 if (!File.Exists(iniFilePath)) 56 if (!File.Exists(iniFilePath))
57 { 57 {
58 m_log.FatalFormat("[CONFIG] File {0} not found, could not load any configuration.", iniFilePath); 58 m_log.FatalFormat("[CONFIG]: File {0} not found, could not load any configuration.", iniFilePath);
59 m_log.FatalFormat("[CONFIG] Did you copy the AssetInventoryServer.ini.example file to AssetInventoryServer.ini?"); 59 m_log.FatalFormat("[CONFIG]: Did you copy the AssetInventoryServer.ini.example file to AssetInventoryServer.ini?");
60 Environment.Exit(1); 60 Environment.Exit(1);
61 } 61 }
62 62
diff --git a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
index 4b5af05..07cbade 100644
--- a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
+++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Grid.AssetInventoryServer
63 public bool Start() 63 public bool Start()
64 { 64 {
65 Startup(); 65 Startup();
66 m_log.Info("[ASSETINVENTORY] Starting AssetInventory Server"); 66 m_log.Info("[ASSETINVENTORY]: Starting AssetInventory Server");
67 67
68 try 68 try
69 { 69 {
@@ -71,7 +71,7 @@ namespace OpenSim.Grid.AssetInventoryServer
71 } 71 }
72 catch (Exception) 72 catch (Exception)
73 { 73 {
74 m_log.Error("[ASSETINVENTORY] Failed to load the config."); 74 m_log.Error("[ASSETINVENTORY]: Failed to load the config.");
75 return false; 75 return false;
76 } 76 }
77 77
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.AssetInventoryServer
92 } 92 }
93 catch (Exception ex) 93 catch (Exception ex)
94 { 94 {
95 m_log.Error("[ASSETINVENTORY] Initializing the HTTP server failed, shutting down: " + ex.Message); 95 m_log.Error("[ASSETINVENTORY]: Initializing the HTTP server failed, shutting down: " + ex.Message);
96 Shutdown(); 96 Shutdown();
97 return false; 97 return false;
98 } 98 }
@@ -122,18 +122,18 @@ namespace OpenSim.Grid.AssetInventoryServer
122 { 122 {
123 foreach (IAssetInventoryServerPlugin plugin in m_frontends) 123 foreach (IAssetInventoryServerPlugin plugin in m_frontends)
124 { 124 {
125 m_log.Debug("[ASSETINVENTORY] Disposing plugin " + plugin.Name); 125 m_log.Debug("[ASSETINVENTORY]: Disposing plugin " + plugin.Name);
126 try { plugin.Dispose(); } 126 try { plugin.Dispose(); }
127 catch (Exception ex) 127 catch (Exception ex)
128 { m_log.ErrorFormat("[ASSETINVENTORY] Failure shutting down plugin {0}: {1}", plugin.Name, ex.Message); } 128 { m_log.ErrorFormat("[ASSETINVENTORY]: Failure shutting down plugin {0}: {1}", plugin.Name, ex.Message); }
129 } 129 }
130 130
131 foreach (IAssetInventoryServerPlugin plugin in m_backends) 131 foreach (IAssetInventoryServerPlugin plugin in m_backends)
132 { 132 {
133 m_log.Debug("[ASSETINVENTORY] Disposing plugin " + plugin.Name); 133 m_log.Debug("[ASSETINVENTORY]: Disposing plugin " + plugin.Name);
134 try { plugin.Dispose(); } 134 try { plugin.Dispose(); }
135 catch (Exception ex) 135 catch (Exception ex)
136 { m_log.ErrorFormat("[ASSETINVENTORY] Failure shutting down plugin {0}: {1}", plugin.Name, ex.Message); } 136 { m_log.ErrorFormat("[ASSETINVENTORY]: Failure shutting down plugin {0}: {1}", plugin.Name, ex.Message); }
137 } 137 }
138 138
139 if (HttpServer != null) 139 if (HttpServer != null)
@@ -145,7 +145,7 @@ namespace OpenSim.Grid.AssetInventoryServer
145 m_httpServer = new BaseHttpServer(port); 145 m_httpServer = new BaseHttpServer(port);
146 m_httpServer.Start(); 146 m_httpServer.Start();
147 147
148 m_log.Info("[ASSETINVENTORY] AssetInventory server is listening on port " + port); 148 m_log.Info("[ASSETINVENTORY]: AssetInventory server is listening on port " + port);
149 } 149 }
150 150
151 private IAssetInventoryServerPlugin LoadAssetInventoryServerPlugin(string addinPath, string provider) 151 private IAssetInventoryServerPlugin LoadAssetInventoryServerPlugin(string addinPath, string provider)
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs
index 517da28..9e3a421 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
50 { 50 {
51 //m_server = server; 51 //m_server = server;
52 52
53 m_log.Info("[ASSET] Authorize All loaded."); 53 m_log.Info("[AUTHORIZEALL]: Authorize All loaded.");
54 } 54 }
55 55
56 /// <summary> 56 /// <summary>
@@ -58,7 +58,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
58 /// </summary> 58 /// </summary>
59 public void Initialise() 59 public void Initialise()
60 { 60 {
61 m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); 61 m_log.InfoFormat("[AUTHORIZEALL]: {0} cannot be default-initialized!", Name);
62 throw new PluginNotInitialisedException(Name); 62 throw new PluginNotInitialisedException(Name);
63 } 63 }
64 64
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
index 3b6e99e..6c98612 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
59 // Request for / or /?... 59 // Request for / or /?...
60 //m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server)); 60 //m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server));
61 61
62 m_log.Info("[ASSET] Browser Frontend loaded."); 62 m_log.Info("[BROWSEFRONTEND]: Browser Frontend loaded.");
63 } 63 }
64 64
65 /// <summary> 65 /// <summary>
@@ -67,7 +67,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
67 /// </summary> 67 /// </summary>
68 public void Initialise() 68 public void Initialise()
69 { 69 {
70 m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); 70 m_log.InfoFormat("[BROWSEFRONTEND]: {0} cannot be default-initialized!", Name);
71 throw new PluginNotInitialisedException(Name); 71 throw new PluginNotInitialisedException(Name);
72 } 72 }
73 73
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs
index 386822a..1fbe780 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
50 { 50 {
51 //m_server = server; 51 //m_server = server;
52 52
53 m_log.Info("[ASSET] Null Authentication loaded."); 53 m_log.Info("[NULLAUTHENTICATION]: Null Authentication loaded.");
54 } 54 }
55 55
56 /// <summary> 56 /// <summary>
@@ -58,7 +58,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
58 /// </summary> 58 /// </summary>
59 public void Initialise() 59 public void Initialise()
60 { 60 {
61 m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); 61 m_log.InfoFormat("[NULLAUTHENTICATION]: {0} cannot be default-initialized!", Name);
62 throw new PluginNotInitialisedException(Name); 62 throw new PluginNotInitialisedException(Name);
63 } 63 }
64 64
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
index 7edab93..eef98dc 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
@@ -47,72 +47,72 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
47 47
48 public void LogAssetMetadataFetch(string extension, BackendResponse response, UUID assetID, DateTime time) 48 public void LogAssetMetadataFetch(string extension, BackendResponse response, UUID assetID, DateTime time)
49 { 49 {
50 m_log.DebugFormat("[{0}] AssetMetadataFetch(): AssetID: {1}, Response: {2}", extension, assetID, response); 50 m_log.DebugFormat("[{0}]: AssetMetadataFetch(): AssetID: {1}, Response: {2}", extension, assetID, response);
51 } 51 }
52 52
53 public void LogAssetDataFetch(string extension, BackendResponse response, UUID assetID, int dataSize, DateTime time) 53 public void LogAssetDataFetch(string extension, BackendResponse response, UUID assetID, int dataSize, DateTime time)
54 { 54 {
55 m_log.DebugFormat("[{0}] AssetDataFetch(): AssetID: {1}, DataSize: {2}, Response: {3}", extension, assetID, 55 m_log.DebugFormat("[{0}]: AssetDataFetch(): AssetID: {1}, DataSize: {2}, Response: {3}", extension, assetID,
56 dataSize, response); 56 dataSize, response);
57 } 57 }
58 58
59 public void LogAssetCreate(string extension, BackendResponse response, UUID assetID, int dataSize, DateTime time) 59 public void LogAssetCreate(string extension, BackendResponse response, UUID assetID, int dataSize, DateTime time)
60 { 60 {
61 m_log.DebugFormat("[{0}] AssetCreate(): AssetID: {1}, DataSize: {2}, Response: {3}", extension, assetID, 61 m_log.DebugFormat("[{0}]: AssetCreate(): AssetID: {1}, DataSize: {2}, Response: {3}", extension, assetID,
62 dataSize, response); 62 dataSize, response);
63 } 63 }
64 64
65 public void LogInventoryFetch(string extension, BackendResponse response, Uri owner, UUID objID, bool folder, DateTime time) 65 public void LogInventoryFetch(string extension, BackendResponse response, Uri owner, UUID objID, bool folder, DateTime time)
66 { 66 {
67 m_log.DebugFormat("[{0}] InventoryFetch(): ObjID: {1}, Folder: {2}, OwnerID: {3}, Response: {4}", extension, 67 m_log.DebugFormat("[{0}]: InventoryFetch(): ObjID: {1}, Folder: {2}, OwnerID: {3}, Response: {4}", extension,
68 objID, folder, owner, response); 68 objID, folder, owner, response);
69 } 69 }
70 70
71 public void LogInventoryFetchFolderContents(string extension, BackendResponse response, Uri owner, UUID folderID, DateTime time) 71 public void LogInventoryFetchFolderContents(string extension, BackendResponse response, Uri owner, UUID folderID, DateTime time)
72 { 72 {
73 m_log.DebugFormat("[{0}] InventoryFetchFolderContents(): FolderID: {1}, OwnerID: {2}, Response: {3}", extension, 73 m_log.DebugFormat("[{0}]: InventoryFetchFolderContents(): FolderID: {1}, OwnerID: {2}, Response: {3}", extension,
74 folderID, owner, response); 74 folderID, owner, response);
75 } 75 }
76 76
77 public void LogInventoryFetchFolderList(string extension, BackendResponse response, Uri owner, DateTime time) 77 public void LogInventoryFetchFolderList(string extension, BackendResponse response, Uri owner, DateTime time)
78 { 78 {
79 m_log.DebugFormat("[{0}] InventoryFetchFolderList(): OwnerID: {1}, Response: {2}", extension, 79 m_log.DebugFormat("[{0}]: InventoryFetchFolderList(): OwnerID: {1}, Response: {2}", extension,
80 owner, response); 80 owner, response);
81 } 81 }
82 82
83 public void LogInventoryFetchInventory(string extension, BackendResponse response, Uri owner, DateTime time) 83 public void LogInventoryFetchInventory(string extension, BackendResponse response, Uri owner, DateTime time)
84 { 84 {
85 m_log.DebugFormat("[{0}] InventoryFetchInventory(): OwnerID: {1}, Response: {2}", extension, 85 m_log.DebugFormat("[{0}]: InventoryFetchInventory(): OwnerID: {1}, Response: {2}", extension,
86 owner, response); 86 owner, response);
87 } 87 }
88 88
89 public void LogInventoryFetchActiveGestures(string extension, BackendResponse response, Uri owner, DateTime time) 89 public void LogInventoryFetchActiveGestures(string extension, BackendResponse response, Uri owner, DateTime time)
90 { 90 {
91 m_log.DebugFormat("[{0}] InventoryFetchActiveGestures(): OwnerID: {1}, Response: {2}", extension, 91 m_log.DebugFormat("[{0}]: InventoryFetchActiveGestures(): OwnerID: {1}, Response: {2}", extension,
92 owner, response); 92 owner, response);
93 } 93 }
94 94
95 public void LogInventoryCreate(string extension, BackendResponse response, Uri owner, bool folder, DateTime time) 95 public void LogInventoryCreate(string extension, BackendResponse response, Uri owner, bool folder, DateTime time)
96 { 96 {
97 m_log.DebugFormat("[{0}] InventoryCreate(): OwnerID: {1}, Response: {2}", extension, 97 m_log.DebugFormat("[{0}]: InventoryCreate(): OwnerID: {1}, Response: {2}", extension,
98 owner, response); 98 owner, response);
99 } 99 }
100 100
101 public void LogInventoryCreateInventory(string extension, BackendResponse response, DateTime time) 101 public void LogInventoryCreateInventory(string extension, BackendResponse response, DateTime time)
102 { 102 {
103 m_log.DebugFormat("[{0}] InventoryCreateInventory(): Response: {1}", extension, 103 m_log.DebugFormat("[{0}]: InventoryCreateInventory(): Response: {1}", extension,
104 response); 104 response);
105 } 105 }
106 106
107 public void LogInventoryDelete(string extension, BackendResponse response, Uri owner, UUID objID, bool folder, DateTime time) 107 public void LogInventoryDelete(string extension, BackendResponse response, Uri owner, UUID objID, bool folder, DateTime time)
108 { 108 {
109 m_log.DebugFormat("[{0}] InventoryDelete(): OwnerID: {1}, Folder: {2}, Response: {3}", extension, 109 m_log.DebugFormat("[{0}]: InventoryDelete(): OwnerID: {1}, Folder: {2}, Response: {3}", extension,
110 owner, folder, response); 110 owner, folder, response);
111 } 111 }
112 112
113 public void LogInventoryPurgeFolder(string extension, BackendResponse response, Uri owner, UUID folderID, DateTime time) 113 public void LogInventoryPurgeFolder(string extension, BackendResponse response, Uri owner, UUID folderID, DateTime time)
114 { 114 {
115 m_log.DebugFormat("[{0}] InventoryPurgeFolder(): OwnerID: {1}, FolderID: {2}, Response: {3}", extension, 115 m_log.DebugFormat("[{0}]: InventoryPurgeFolder(): OwnerID: {1}, FolderID: {2}, Response: {3}", extension,
116 owner, response); 116 owner, response);
117 } 117 }
118 118
@@ -130,7 +130,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
130 /// </summary> 130 /// </summary>
131 public void Initialise() 131 public void Initialise()
132 { 132 {
133 m_log.Info("[ASSET] Null metrics loaded."); 133 m_log.Info("[NULLMETRICS]: Null metrics loaded.");
134 } 134 }
135 135
136 public void Dispose() 136 public void Dispose()
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs
index f8f4cce..d2a87e6 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
62 // Asset creation 62 // Asset creation
63 m_server.HttpServer.AddStreamHandler(new AssetPostHandler(server)); 63 m_server.HttpServer.AddStreamHandler(new AssetPostHandler(server));
64 64
65 m_log.Info("[ASSET] OpenSim Asset Frontend loaded."); 65 m_log.Info("[OPENSIMASSETFRONTEND]: OpenSim Asset Frontend loaded.");
66 } 66 }
67 67
68 /// <summary> 68 /// <summary>
@@ -70,7 +70,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
70 /// </summary> 70 /// </summary>
71 public void Initialise() 71 public void Initialise()
72 { 72 {
73 m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); 73 m_log.InfoFormat("[OPENSIMASSETFRONTEND]: {0} cannot be default-initialized!", Name);
74 throw new PluginNotInitialisedException(Name); 74 throw new PluginNotInitialisedException(Name);
75 } 75 }
76 76
@@ -128,13 +128,13 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
128 } 128 }
129 else 129 else
130 { 130 {
131 m_log.WarnFormat("Failed to fetch asset data or metadata for {0}: {1}", assetID, dataResponse); 131 m_log.WarnFormat("[OPENSIMASSETFRONTEND]: Failed to fetch asset data or metadata for {0}: {1}", assetID, dataResponse);
132 httpResponse.StatusCode = (int) HttpStatusCode.NotFound; 132 httpResponse.StatusCode = (int) HttpStatusCode.NotFound;
133 } 133 }
134 } 134 }
135 else 135 else
136 { 136 {
137 m_log.Warn("Unrecognized OpenSim asset request: " + httpRequest.Url.PathAndQuery); 137 m_log.Warn("[OPENSIMASSETFRONTEND]: Unrecognized OpenSim asset request: " + httpRequest.Url.PathAndQuery);
138 } 138 }
139 139
140 return buffer; 140 return buffer;
@@ -161,7 +161,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
161 } 161 }
162 catch (Exception ex) 162 catch (Exception ex)
163 { 163 {
164 m_log.Warn("Failed to parse POST data (expecting AssetBase): " + ex.Message); 164 m_log.Warn("[OPENSIMASSETFRONTEND]: Failed to parse POST data (expecting AssetBase): " + ex.Message);
165 httpResponse.StatusCode = (int) HttpStatusCode.BadRequest; 165 httpResponse.StatusCode = (int) HttpStatusCode.BadRequest;
166 } 166 }
167 167
@@ -178,7 +178,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
178 } 178 }
179 else 179 else
180 { 180 {
181 m_log.Warn("AssetPostHandler called with no asset data"); 181 m_log.Warn("[OPENSIMASSETFRONTEND]: AssetPostHandler called with no asset data");
182 httpResponse.StatusCode = (int) HttpStatusCode.BadRequest; 182 httpResponse.StatusCode = (int) HttpStatusCode.BadRequest;
183 } 183 }
184 184
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
index fccf50d..69dcff3 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
134 // } 134 // }
135 // catch (MySqlException ex) 135 // catch (MySqlException ex)
136 // { 136 // {
137 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 137 // m_log.Error("[OPENSIMASSETSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
138 // return 0; 138 // return 0;
139 // } 139 // }
140 140
@@ -174,15 +174,15 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
174 m_openSimConfig.GetString("asset_database_connect")); 174 m_openSimConfig.GetString("asset_database_connect"));
175 if (m_assetProvider == null) 175 if (m_assetProvider == null)
176 { 176 {
177 m_log.Error("[ASSET]: Failed to load a database plugin, server halting."); 177 m_log.Error("[OPENSIMASSETSTORAGE]: Failed to load a database plugin, server halting.");
178 Environment.Exit(-1); 178 Environment.Exit(-1);
179 } 179 }
180 else 180 else
181 m_log.InfoFormat("[ASSET]: Loaded storage backend: {0}", Version); 181 m_log.InfoFormat("[OPENSIMASSETSTORAGE]: Loaded storage backend: {0}", Version);
182 } 182 }
183 catch (Exception e) 183 catch (Exception e)
184 { 184 {
185 m_log.WarnFormat("[ASSET]: Failure loading data plugin: {0}", e.ToString()); 185 m_log.WarnFormat("[OPENSIMASSETSTORAGE]: Failure loading data plugin: {0}", e.ToString());
186 } 186 }
187 } 187 }
188 188
@@ -191,7 +191,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
191 /// </summary> 191 /// </summary>
192 public void Initialise() 192 public void Initialise()
193 { 193 {
194 m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); 194 m_log.InfoFormat("[OPENSIMASSETSTORAGE]: {0} cannot be default-initialized!", Name);
195 throw new PluginNotInitialisedException(Name); 195 throw new PluginNotInitialisedException(Name);
196 } 196 }
197 197
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs
index 7f8d8f9..76d7122 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
67 //m_server.HttpServer.AddHandler("post", null, @"^/RootFolders/", RootFoldersHandler); 67 //m_server.HttpServer.AddHandler("post", null, @"^/RootFolders/", RootFoldersHandler);
68 //m_server.HttpServer.AddHandler("post", null, @"^/ActiveGestures/", ActiveGesturesHandler); 68 //m_server.HttpServer.AddHandler("post", null, @"^/ActiveGestures/", ActiveGesturesHandler);
69 69
70 m_log.Info("[INVENTORY] OpenSim Inventory Frontend loaded."); 70 m_log.Info("[OPENSIMINVENTORYFRONTEND]: OpenSim Inventory Frontend loaded.");
71 } 71 }
72 72
73 /// <summary> 73 /// <summary>
@@ -75,7 +75,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
75 /// </summary> 75 /// </summary>
76 public void Initialise() 76 public void Initialise()
77 { 77 {
78 m_log.InfoFormat("[INVENTORY]: {0} cannot be default-initialized!", Name); 78 m_log.InfoFormat("[OPENSIMINVENTORYFRONTEND]: {0} cannot be default-initialized!", Name);
79 throw new PluginNotInitialisedException(Name); 79 throw new PluginNotInitialisedException(Name);
80 } 80 }
81 81
@@ -103,7 +103,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
103 103
104 // if (ownerID != UUID.Zero) 104 // if (ownerID != UUID.Zero)
105 // { 105 // {
106 // m_log.Warn("GetInventory is not scalable on some inventory backends, avoid calling it wherever possible"); 106 // m_log.Warn("[OPENSIMINVENTORYFRONTEND]: GetInventory is not scalable on some inventory backends, avoid calling it wherever possible");
107 107
108 // Uri owner = Utils.GetOpenSimUri(ownerID); 108 // Uri owner = Utils.GetOpenSimUri(ownerID);
109 // InventoryCollection inventory; 109 // InventoryCollection inventory;
@@ -144,7 +144,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
144 // if (ownerID != UUID.Zero) 144 // if (ownerID != UUID.Zero)
145 // { 145 // {
146 // Uri owner = Utils.GetOpenSimUri(ownerID); 146 // Uri owner = Utils.GetOpenSimUri(ownerID);
147 // m_log.DebugFormat("Created URI {0} for inventory creation", owner); 147 // m_log.DebugFormat("[OPENSIMINVENTORYFRONTEND]: Created URI {0} for inventory creation", owner);
148 148
149 // InventoryFolder rootFolder = new InventoryFolder("My Inventory", ownerID, UUID.Zero, (short)AssetType.Folder); 149 // InventoryFolder rootFolder = new InventoryFolder("My Inventory", ownerID, UUID.Zero, (short)AssetType.Folder);
150 // BackendResponse storageResponse = m_server.InventoryProvider.TryCreateInventory(owner, rootFolder); 150 // BackendResponse storageResponse = m_server.InventoryProvider.TryCreateInventory(owner, rootFolder);
@@ -365,7 +365,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
365 // } 365 // }
366 // catch (Exception ex) 366 // catch (Exception ex)
367 // { 367 // {
368 // m_log.Warn("Failed to parse POST data (expecting guid): " + ex.Message); 368 // m_log.Warn("[OPENSIMINVENTORYFRONTEND]: Failed to parse POST data (expecting guid): " + ex.Message);
369 // } 369 // }
370 370
371 // return id; 371 // return id;
@@ -389,7 +389,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
389 // } 389 // }
390 // catch (Exception ex) 390 // catch (Exception ex)
391 // { 391 // {
392 // m_log.Warn("Failed to parse GetInventory POST data: " + ex.Message); 392 // m_log.Warn("[OPENSIMINVENTORYFRONTEND]: Failed to parse GetInventory POST data: " + ex.Message);
393 // agentID = UUID.Zero; 393 // agentID = UUID.Zero;
394 // sessionID = UUID.Zero; 394 // sessionID = UUID.Zero;
395 // return UUID.Zero; 395 // return UUID.Zero;
@@ -426,7 +426,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
426 // } 426 // }
427 // catch (Exception ex) 427 // catch (Exception ex)
428 // { 428 // {
429 // m_log.Warn("Failed to parse POST data (expecting InventoryFolderBase): " + ex.Message); 429 // m_log.Warn("[OPENSIMINVENTORYFRONTEND]: Failed to parse POST data (expecting InventoryFolderBase): " + ex.Message);
430 // agentID = UUID.Zero; 430 // agentID = UUID.Zero;
431 // sessionID = UUID.Zero; 431 // sessionID = UUID.Zero;
432 // return null; 432 // return null;
@@ -474,7 +474,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
474 // } 474 // }
475 // catch (Exception ex) 475 // catch (Exception ex)
476 // { 476 // {
477 // m_log.Warn("Failed to parse POST data (expecting InventoryItemBase): " + ex.Message); 477 // m_log.Warn("[OPENSIMINVENTORYFRONTEND]: Failed to parse POST data (expecting InventoryItemBase): " + ex.Message);
478 // agentID = UUID.Zero; 478 // agentID = UUID.Zero;
479 // sessionID = UUID.Zero; 479 // sessionID = UUID.Zero;
480 // return null; 480 // return null;
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs
index 69b8497..2f5d2ca 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
107 // } 107 // }
108 // catch (MySqlException ex) 108 // catch (MySqlException ex)
109 // { 109 // {
110 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 110 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
111 // ret = BackendResponse.Failure; 111 // ret = BackendResponse.Failure;
112 // } 112 // }
113 //} 113 //}
@@ -155,7 +155,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
155 // } 155 // }
156 // catch (MySqlException ex) 156 // catch (MySqlException ex)
157 // { 157 // {
158 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 158 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
159 // ret = BackendResponse.Failure; 159 // ret = BackendResponse.Failure;
160 // } 160 // }
161 //} 161 //}
@@ -253,7 +253,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
253 // } 253 // }
254 // catch (MySqlException ex) 254 // catch (MySqlException ex)
255 // { 255 // {
256 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 256 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
257 // ret = BackendResponse.Failure; 257 // ret = BackendResponse.Failure;
258 // } 258 // }
259 //} 259 //}
@@ -303,7 +303,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
303 // } 303 // }
304 // catch (MySqlException ex) 304 // catch (MySqlException ex)
305 // { 305 // {
306 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 306 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
307 // ret = BackendResponse.Failure; 307 // ret = BackendResponse.Failure;
308 // } 308 // }
309 // } 309 // }
@@ -387,7 +387,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
387 // } 387 // }
388 // catch (MySqlException ex) 388 // catch (MySqlException ex)
389 // { 389 // {
390 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 390 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
391 // ret = BackendResponse.Failure; 391 // ret = BackendResponse.Failure;
392 // } 392 // }
393 // } 393 // }
@@ -458,7 +458,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
458 // } 458 // }
459 // catch (MySqlException ex) 459 // catch (MySqlException ex)
460 // { 460 // {
461 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 461 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
462 // ret = BackendResponse.Failure; 462 // ret = BackendResponse.Failure;
463 // } 463 // }
464 // } 464 // }
@@ -520,18 +520,18 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
520 // } 520 // }
521 // else if (rowsAffected == 2) 521 // else if (rowsAffected == 2)
522 // { 522 // {
523 // m_log.Info("Replaced inventory item " + item.ID.ToString()); 523 // m_log.Info("[OPENSIMINVENTORYSTORAGE]: Replaced inventory item " + item.ID.ToString());
524 // ret = BackendResponse.Success; 524 // ret = BackendResponse.Success;
525 // } 525 // }
526 // else 526 // else
527 // { 527 // {
528 // m_log.ErrorFormat("MySQL REPLACE query affected {0} rows", rowsAffected); 528 // m_log.ErrorFormat("[OPENSIMINVENTORYSTORAGE]: MySQL REPLACE query affected {0} rows", rowsAffected);
529 // ret = BackendResponse.Failure; 529 // ret = BackendResponse.Failure;
530 // } 530 // }
531 // } 531 // }
532 // catch (MySqlException ex) 532 // catch (MySqlException ex)
533 // { 533 // {
534 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 534 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
535 // ret = BackendResponse.Failure; 535 // ret = BackendResponse.Failure;
536 // } 536 // }
537 //} 537 //}
@@ -569,18 +569,18 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
569 // } 569 // }
570 // else if (rowsAffected == 2) 570 // else if (rowsAffected == 2)
571 // { 571 // {
572 // m_log.Info("Replaced inventory folder " + folder.ID.ToString()); 572 // m_log.Info("[OPENSIMINVENTORYSTORAGE]: Replaced inventory folder " + folder.ID.ToString());
573 // ret = BackendResponse.Success; 573 // ret = BackendResponse.Success;
574 // } 574 // }
575 // else 575 // else
576 // { 576 // {
577 // m_log.ErrorFormat("MySQL REPLACE query affected {0} rows", rowsAffected); 577 // m_log.ErrorFormat("[OPENSIMINVENTORYSTORAGE]: MySQL REPLACE query affected {0} rows", rowsAffected);
578 // ret = BackendResponse.Failure; 578 // ret = BackendResponse.Failure;
579 // } 579 // }
580 // } 580 // }
581 // catch (MySqlException ex) 581 // catch (MySqlException ex)
582 // { 582 // {
583 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 583 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
584 // ret = BackendResponse.Failure; 584 // ret = BackendResponse.Failure;
585 // } 585 // }
586 //} 586 //}
@@ -621,13 +621,13 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
621 // } 621 // }
622 // else 622 // else
623 // { 623 // {
624 // m_log.ErrorFormat("MySQL DELETE query affected {0} rows", rowsAffected); 624 // m_log.ErrorFormat("[OPENSIMINVENTORYSTORAGE]: MySQL DELETE query affected {0} rows", rowsAffected);
625 // ret = BackendResponse.NotFound; 625 // ret = BackendResponse.NotFound;
626 // } 626 // }
627 // } 627 // }
628 // catch (MySqlException ex) 628 // catch (MySqlException ex)
629 // { 629 // {
630 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 630 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
631 // ret = BackendResponse.Failure; 631 // ret = BackendResponse.Failure;
632 // } 632 // }
633 // } 633 // }
@@ -668,13 +668,13 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
668 // } 668 // }
669 // else 669 // else
670 // { 670 // {
671 // m_log.ErrorFormat("MySQL DELETE query affected {0} rows", rowsAffected); 671 // m_log.ErrorFormat("[OPENSIMINVENTORYSTORAGE]: MySQL DELETE query affected {0} rows", rowsAffected);
672 // ret = BackendResponse.NotFound; 672 // ret = BackendResponse.NotFound;
673 // } 673 // }
674 // } 674 // }
675 // catch (MySqlException ex) 675 // catch (MySqlException ex)
676 // { 676 // {
677 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 677 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
678 // ret = BackendResponse.Failure; 678 // ret = BackendResponse.Failure;
679 // } 679 // }
680 // } 680 // }
@@ -726,13 +726,13 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
726 726
727 // #endregion Delete folders 727 // #endregion Delete folders
728 728
729 // m_log.DebugFormat("Deleted {0} inventory objects from MySQL in a folder purge", rowsAffected); 729 // m_log.DebugFormat("[OPENSIMINVENTORYSTORAGE]: Deleted {0} inventory objects from MySQL in a folder purge", rowsAffected);
730 730
731 // ret = BackendResponse.Success; 731 // ret = BackendResponse.Success;
732 // } 732 // }
733 // catch (MySqlException ex) 733 // catch (MySqlException ex)
734 // { 734 // {
735 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 735 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
736 // ret = BackendResponse.Failure; 736 // ret = BackendResponse.Failure;
737 // } 737 // }
738 // } 738 // }
@@ -766,7 +766,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
766 // } 766 // }
767 // catch (MySqlException ex) 767 // catch (MySqlException ex)
768 // { 768 // {
769 // m_log.Error("Connection to MySQL backend failed: " + ex.Message); 769 // m_log.Error("[OPENSIMINVENTORYSTORAGE]: Connection to MySQL backend failed: " + ex.Message);
770 // return 0; 770 // return 0;
771 // } 771 // }
772 772
@@ -806,15 +806,15 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
806 m_openSimConfig.GetString("inventory_database_connect")); 806 m_openSimConfig.GetString("inventory_database_connect"));
807 if (m_inventoryProvider == null) 807 if (m_inventoryProvider == null)
808 { 808 {
809 m_log.Error("[INVENTORY]: Failed to load a database plugin, server halting."); 809 m_log.Error("[OPENSIMINVENTORYSTORAGE]: Failed to load a database plugin, server halting.");
810 Environment.Exit(-1); 810 Environment.Exit(-1);
811 } 811 }
812 else 812 else
813 m_log.InfoFormat("[INVENTORY]: Loaded storage backend: {0}", Version); 813 m_log.InfoFormat("[OPENSIMINVENTORYSTORAGE]: Loaded storage backend: {0}", Version);
814 } 814 }
815 catch (Exception e) 815 catch (Exception e)
816 { 816 {
817 m_log.WarnFormat("[INVENTORY]: Failure loading data plugin: {0}", e.ToString()); 817 m_log.WarnFormat("[OPENSIMINVENTORYSTORAGE]: Failure loading data plugin: {0}", e.ToString());
818 } 818 }
819 } 819 }
820 820
@@ -824,7 +824,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
824 824
825 public void Initialise() 825 public void Initialise()
826 { 826 {
827 m_log.InfoFormat("[INVENTORY]: {0} cannot be default-initialized!", Name); 827 m_log.InfoFormat("[OPENSIMINVENTORYSTORAGE]: {0} cannot be default-initialized!", Name);
828 throw new PluginNotInitialisedException(Name); 828 throw new PluginNotInitialisedException(Name);
829 } 829 }
830 830
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
index f19be08..af10393 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
63 // Asset creation 63 // Asset creation
64 //m_server.HttpServer.AddStreamHandler(new CreateRequestHandler(server)); 64 //m_server.HttpServer.AddStreamHandler(new CreateRequestHandler(server));
65 65
66 m_log.Info("[ASSET] Reference Frontend loaded."); 66 m_log.Info("[REFERENCEFRONTEND]: Reference Frontend loaded.");
67 } 67 }
68 68
69 /// <summary> 69 /// <summary>
@@ -71,7 +71,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
71 /// </summary> 71 /// </summary>
72 public void Initialise() 72 public void Initialise()
73 { 73 {
74 m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); 74 m_log.InfoFormat("[REFERENCEFRONTEND]: {0} cannot be default-initialized!", Name);
75 throw new PluginNotInitialisedException(Name); 75 throw new PluginNotInitialisedException(Name);
76 } 76 }
77 77
@@ -159,7 +159,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
159 // } 159 // }
160 // else if (storageResponse == BackendResponse.NotFound) 160 // else if (storageResponse == BackendResponse.NotFound)
161 // { 161 // {
162 // m_log.Warn("Could not find metadata for asset " + assetID.ToString()); 162 // m_log.Warn("[REFERENCEFRONTEND]: Could not find metadata for asset " + assetID.ToString());
163 // httpResponse.StatusCode = (int) HttpStatusCode.NotFound; 163 // httpResponse.StatusCode = (int) HttpStatusCode.NotFound;
164 // } 164 // }
165 // else 165 // else
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
generated by cgit v1.1 at 2024-12-23 22:00:47 +0000