diff options
| author | Justin Clark-Casey (justincc) | 2013-04-10 00:03:37 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-04-10 00:03:37 +0100 |
| commit | e20b0d5695dc583d161b39fa26bfd56e63c7b30e (patch) | |
| tree | eacb73e96d3c3dc214fcb9a93fd9d69a6bb23c59 /OpenSim | |
| parent | Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 02... (diff) | |
| download | opensim-SC-e20b0d5695dc583d161b39fa26bfd56e63c7b30e.zip opensim-SC-e20b0d5695dc583d161b39fa26bfd56e63c7b30e.tar.gz opensim-SC-e20b0d5695dc583d161b39fa26bfd56e63c7b30e.tar.bz2 opensim-SC-e20b0d5695dc583d161b39fa26bfd56e63c7b30e.tar.xz | |
minor: Make exceptions thrown by MySQLAssetData more consistent.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index cf80b3d..21362b9 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
| @@ -142,7 +142,8 @@ namespace OpenSim.Data.MySQL | |||
| 142 | } | 142 | } |
| 143 | catch (Exception e) | 143 | catch (Exception e) |
| 144 | { | 144 | { |
| 145 | m_log.Error("[ASSETS DB]: MySql failure fetching asset " + assetID + ": " + e.Message); | 145 | m_log.Error( |
| 146 | string.Format("[ASSETS DB]: MySql failure fetching asset {0}. Exception ", assetID), e); | ||
| 146 | } | 147 | } |
| 147 | } | 148 | } |
| 148 | } | 149 | } |
| @@ -209,8 +210,11 @@ namespace OpenSim.Data.MySQL | |||
| 209 | } | 210 | } |
| 210 | catch (Exception e) | 211 | catch (Exception e) |
| 211 | { | 212 | { |
| 212 | m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}", | 213 | m_log.Error( |
| 213 | asset.FullID, asset.Name, e.Message); | 214 | string.Format( |
| 215 | "[ASSET DB]: MySQL failure creating asset {0} with name {1}. Exception ", | ||
| 216 | asset.FullID, asset.Name) | ||
| 217 | , e); | ||
| 214 | } | 218 | } |
| 215 | } | 219 | } |
| 216 | } | 220 | } |
| @@ -241,10 +245,11 @@ namespace OpenSim.Data.MySQL | |||
| 241 | } | 245 | } |
| 242 | catch (Exception e) | 246 | catch (Exception e) |
| 243 | { | 247 | { |
| 244 | m_log.ErrorFormat( | 248 | m_log.Error( |
| 245 | "[ASSETS DB]: " + | 249 | string.Format( |
| 246 | "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString() | 250 | "[ASSETS DB]: Failure updating access_time for asset {0} with name {1}. Exception ", |
| 247 | + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name); | 251 | asset.FullID, asset.Name), |
| 252 | e); | ||
| 248 | } | 253 | } |
| 249 | } | 254 | } |
| 250 | } | 255 | } |
| @@ -284,8 +289,8 @@ namespace OpenSim.Data.MySQL | |||
| 284 | } | 289 | } |
| 285 | catch (Exception e) | 290 | catch (Exception e) |
| 286 | { | 291 | { |
| 287 | m_log.ErrorFormat( | 292 | m_log.Error( |
| 288 | "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString(), uuid); | 293 | string.Format("[ASSETS DB]: MySql failure fetching asset {0}. Exception ", uuid), e); |
| 289 | } | 294 | } |
| 290 | } | 295 | } |
| 291 | } | 296 | } |
| @@ -344,7 +349,11 @@ namespace OpenSim.Data.MySQL | |||
| 344 | } | 349 | } |
| 345 | catch (Exception e) | 350 | catch (Exception e) |
| 346 | { | 351 | { |
| 347 | m_log.Error("[ASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString()); | 352 | m_log.Error( |
| 353 | string.Format( | ||
| 354 | "[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}. Exception ", | ||
| 355 | start, count), | ||
| 356 | e); | ||
| 348 | } | 357 | } |
| 349 | } | 358 | } |
| 350 | } | 359 | } |