diff options
author | Jeff Ames | 2008-02-13 03:38:18 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-13 03:38:18 +0000 |
commit | 001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6 (patch) | |
tree | 35f528caf55171c0c53cd81501ebaa22f31e0d2a /OpenSim/Framework/Communications/Cache | |
parent | * Clean up LIBRARY INVENTORY messages (diff) | |
download | opensim-SC_OLD-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.zip opensim-SC_OLD-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.tar.gz opensim-SC_OLD-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.tar.bz2 opensim-SC_OLD-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.tar.xz |
Clean up more unnecessary String.Format calls
Diffstat (limited to '')
5 files changed, 18 insertions, 31 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs index d40c354..3882ade 100644 --- a/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs +++ b/OpenSim/Framework/Communications/Cache/AgentAssetTransactions.cs | |||
@@ -113,10 +113,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
113 | // [or maybe we can if we do more checking like data lenght checks] | 113 | // [or maybe we can if we do more checking like data lenght checks] |
114 | if (uploaderFound != null) | 114 | if (uploaderFound != null) |
115 | { | 115 | { |
116 | // m_log.Info( | 116 | // m_log.InfoFormat( |
117 | // String.Format( | 117 | // "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}", |
118 | // "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}", | 118 | // xferID, uploaderFound.TransactionID); |
119 | // xferID, uploaderFound.TransactionID)); | ||
120 | 119 | ||
121 | // XferUploaders.Remove(uploaderFound.TransactionID); | 120 | // XferUploaders.Remove(uploaderFound.TransactionID); |
122 | 121 | ||
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 2b06d4f..effaa82 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -266,9 +266,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
266 | } | 266 | } |
267 | } while (--maxPolls > 0); | 267 | } while (--maxPolls > 0); |
268 | 268 | ||
269 | m_log.Warn( | 269 | m_log.WarnFormat("[ASSETCACHE]: Asset {0} was not received before the retrieval timeout was reached", assetID.ToString()); |
270 | String.Format("[ASSETCACHE]: Asset {0} was not received before the retrieval timeout was reached", assetID.ToString()) | ||
271 | ); | ||
272 | 270 | ||
273 | return null; | 271 | return null; |
274 | } | 272 | } |
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index 6cded49..6820027 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs | |||
@@ -70,15 +70,13 @@ namespace OpenSim.Framework.Communications.Cache | |||
70 | 70 | ||
71 | if (asset != null) | 71 | if (asset != null) |
72 | { | 72 | { |
73 | //m_log.Info( | 73 | //m_log.InfoFormat("[ASSET]: Asset {0} received from asset server", req.AssetID); |
74 | // String.Format("[ASSET]: Asset {0} received from asset server", req.AssetID)); | ||
75 | 74 | ||
76 | m_receiver.AssetReceived(asset, req.IsTexture); | 75 | m_receiver.AssetReceived(asset, req.IsTexture); |
77 | } | 76 | } |
78 | else | 77 | else |
79 | { | 78 | { |
80 | m_log.Error( | 79 | m_log.ErrorFormat("[ASSET]: Asset {0} not found by asset server", req.AssetID); |
81 | String.Format("[ASSET]: Asset {0} not found by asset server", req.AssetID)); | ||
82 | 80 | ||
83 | m_receiver.AssetNotFound(req.AssetID); | 81 | m_receiver.AssetNotFound(req.AssetID); |
84 | } | 82 | } |
@@ -93,7 +91,6 @@ namespace OpenSim.Framework.Communications.Cache | |||
93 | CommitAssets(); | 91 | CommitAssets(); |
94 | } | 92 | } |
95 | 93 | ||
96 | |||
97 | public AssetServerBase() | 94 | public AssetServerBase() |
98 | { | 95 | { |
99 | m_log.Info("[ASSETSERVER]: Starting asset storage system"); | 96 | m_log.Info("[ASSETSERVER]: Starting asset storage system"); |
@@ -163,4 +160,4 @@ namespace OpenSim.Framework.Communications.Cache | |||
163 | { | 160 | { |
164 | } | 161 | } |
165 | } | 162 | } |
166 | } \ No newline at end of file | 163 | } |
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 604cd2c..b3d3c7c 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -140,9 +140,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
140 | /// <param name="assets"></param> | 140 | /// <param name="assets"></param> |
141 | protected void LoadLibraries(string librariesControlPath) | 141 | protected void LoadLibraries(string librariesControlPath) |
142 | { | 142 | { |
143 | m_log.Info( | 143 | m_log.InfoFormat( |
144 | String.Format( | 144 | "[LIBRARY INVENTORY]: Loading libraries control file {0}", librariesControlPath); |
145 | "[LIBRARY INVENTORY]: Loading libraries control file {0}", librariesControlPath)); | ||
146 | 145 | ||
147 | LoadFromFile(librariesControlPath, "Libraries control", ReadLibraryFromConfig); | 146 | LoadFromFile(librariesControlPath, "Libraries control", ReadLibraryFromConfig); |
148 | } | 147 | } |
@@ -188,9 +187,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
188 | 187 | ||
189 | libraryFolders.Add(folderInfo.folderID, folderInfo); | 188 | libraryFolders.Add(folderInfo.folderID, folderInfo); |
190 | parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo); | 189 | parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo); |
191 | 190 | ||
192 | // m_log.Info( | 191 | // m_log.InfoFormat("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID); |
193 | // String.Format("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID)); | ||
194 | } | 192 | } |
195 | else | 193 | else |
196 | { | 194 | { |
@@ -258,14 +256,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
258 | } | 256 | } |
259 | catch (XmlException e) | 257 | catch (XmlException e) |
260 | { | 258 | { |
261 | m_log.Error( | 259 | m_log.ErrorFormat("[LIBRARY INVENTORY]: Error loading {0} : {1}", path, e); |
262 | String.Format("[LIBRARY INVENTORY]: Error loading {0} : {1}", path, e)); | ||
263 | } | 260 | } |
264 | } | 261 | } |
265 | else | 262 | else |
266 | { | 263 | { |
267 | m_log.Error( | 264 | m_log.ErrorFormat("[LIBRARY INVENTORY]: {0} file {1} does not exist!", fileDescription, path); |
268 | String.Format("[LIBRARY INVENTORY]: {0} file {1} does not exist!", fileDescription, path)); | ||
269 | } | 265 | } |
270 | } | 266 | } |
271 | 267 | ||
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 257747b..455f722 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -233,28 +233,25 @@ namespace OpenSim.Framework.Communications.Cache | |||
233 | } | 233 | } |
234 | else | 234 | else |
235 | { | 235 | { |
236 | m_log.Error( | 236 | m_log.ErrorFormat("[INVENTORYCACHE]: Could not find root folder for user {0}", remoteClient.Name); |
237 | String.Format("[INVENTORYCACHE]: Could not find root folder for user {0}", remoteClient.Name)); | ||
238 | 237 | ||
239 | return; | 238 | return; |
240 | } | 239 | } |
241 | } | 240 | } |
242 | else | 241 | else |
243 | { | 242 | { |
244 | m_log.Error( | 243 | m_log.ErrorFormat("[INVENTORYCACHE]: " + |
245 | String.Format("[INVENTORYCACHE]: " + | ||
246 | "Could not find user profile for {0} for folder {1}", | 244 | "Could not find user profile for {0} for folder {1}", |
247 | remoteClient.Name, folderID)); | 245 | remoteClient.Name, folderID); |
248 | 246 | ||
249 | return; | 247 | return; |
250 | } | 248 | } |
251 | 249 | ||
252 | // If we've reached this point then we couldn't find the folder, even though the client thinks | 250 | // If we've reached this point then we couldn't find the folder, even though the client thinks |
253 | // it exists | 251 | // it exists |
254 | m_log.Error( | 252 | m_log.ErrorFormat("[INVENTORYCACHE]: " + |
255 | String.Format("[INVENTORYCACHE]: " + | ||
256 | "Could not find folder {0} for user {1}", | 253 | "Could not find folder {0} for user {1}", |
257 | folderID, remoteClient.Name)); | 254 | folderID, remoteClient.Name); |
258 | } | 255 | } |
259 | 256 | ||
260 | public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, LLUUID folderID) | 257 | public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, LLUUID folderID) |