aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-02-27 21:35:54 +0000
committerJustin Clark-Casey (justincc)2013-02-27 21:35:54 +0000
commit74916ed777d811088344077b08a190ff17129c70 (patch)
tree1667e438b32bdd85106a6f29c886a1d2aadb745e /OpenSim
parentminor: remove some mono compiler warnings in script regression tests (diff)
downloadopensim-SC_OLD-74916ed777d811088344077b08a190ff17129c70.zip
opensim-SC_OLD-74916ed777d811088344077b08a190ff17129c70.tar.gz
opensim-SC_OLD-74916ed777d811088344077b08a190ff17129c70.tar.bz2
opensim-SC_OLD-74916ed777d811088344077b08a190ff17129c70.tar.xz
Add more information to warnings logged when asset names and descriptions have to be truncated for database storage
On balance, I still think this is useful because asset names and descriptions can sometimes be helpful in determining what things are. Even though they are never subsequently (inventory names/descriptions are always used instead).
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLXAssetData.cs8
3 files changed, 18 insertions, 6 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index c7488d8..f3e008d 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -163,14 +163,18 @@ namespace OpenSim.Data.MSSQL
163 if (asset.Name.Length > 64) 163 if (asset.Name.Length > 64)
164 { 164 {
165 assetName = asset.Name.Substring(0, 64); 165 assetName = asset.Name.Substring(0, 64);
166 m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add"); 166 m_log.WarnFormat(
167 "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
168 asset.Name, asset.ID, asset.Name.Length, assetName.Length);
167 } 169 }
168 170
169 string assetDescription = asset.Description; 171 string assetDescription = asset.Description;
170 if (asset.Description.Length > 64) 172 if (asset.Description.Length > 64)
171 { 173 {
172 assetDescription = asset.Description.Substring(0, 64); 174 assetDescription = asset.Description.Substring(0, 64);
173 m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add"); 175 m_log.WarnFormat(
176 "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
177 asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
174 } 178 }
175 179
176 using (SqlConnection conn = new SqlConnection(m_connectionString)) 180 using (SqlConnection conn = new SqlConnection(m_connectionString))
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 73de64b..cf80b3d 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -173,14 +173,18 @@ namespace OpenSim.Data.MySQL
173 if (asset.Name.Length > 64) 173 if (asset.Name.Length > 64)
174 { 174 {
175 assetName = asset.Name.Substring(0, 64); 175 assetName = asset.Name.Substring(0, 64);
176 m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add"); 176 m_log.WarnFormat(
177 "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
178 asset.Name, asset.ID, asset.Name.Length, assetName.Length);
177 } 179 }
178 180
179 string assetDescription = asset.Description; 181 string assetDescription = asset.Description;
180 if (asset.Description.Length > 64) 182 if (asset.Description.Length > 64)
181 { 183 {
182 assetDescription = asset.Description.Substring(0, 64); 184 assetDescription = asset.Description.Substring(0, 64);
183 m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add"); 185 m_log.WarnFormat(
186 "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
187 asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
184 } 188 }
185 189
186 try 190 try
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index e6ac22e..c2282c8 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -204,14 +204,18 @@ namespace OpenSim.Data.MySQL
204 if (asset.Name.Length > 64) 204 if (asset.Name.Length > 64)
205 { 205 {
206 assetName = asset.Name.Substring(0, 64); 206 assetName = asset.Name.Substring(0, 64);
207 m_log.Warn("[XASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add"); 207 m_log.WarnFormat(
208 "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
209 asset.Name, asset.ID, asset.Name.Length, assetName.Length);
208 } 210 }
209 211
210 string assetDescription = asset.Description; 212 string assetDescription = asset.Description;
211 if (asset.Description.Length > 64) 213 if (asset.Description.Length > 64)
212 { 214 {
213 assetDescription = asset.Description.Substring(0, 64); 215 assetDescription = asset.Description.Substring(0, 64);
214 m_log.Warn("[XASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add"); 216 m_log.WarnFormat(
217 "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
218 asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
215 } 219 }
216 220
217 if (m_enableCompression) 221 if (m_enableCompression)