diff options
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLManager.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLManager.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index f16795e..3bb6857 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs | |||
@@ -26,14 +26,14 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
31 | using System.Data; | 31 | using System.Data; |
32 | using System.IO; | 32 | using System.IO; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenMetaverse; | ||
35 | using log4net; | 34 | using log4net; |
36 | using MySql.Data.MySqlClient; | 35 | using MySql.Data.MySqlClient; |
36 | using OpenMetaverse; | ||
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | 38 | ||
39 | namespace OpenSim.Data.MySQL | 39 | namespace OpenSim.Data.MySQL |
@@ -148,7 +148,7 @@ namespace OpenSim.Data.MySQL | |||
148 | cmd.Dispose(); | 148 | cmd.Dispose(); |
149 | } | 149 | } |
150 | 150 | ||
151 | m_lastConnectionUse = System.DateTime.Now.Ticks; | 151 | m_lastConnectionUse = DateTime.Now.Ticks; |
152 | 152 | ||
153 | m_log.DebugFormat( | 153 | m_log.DebugFormat( |
154 | "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond); | 154 | "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond); |
@@ -161,7 +161,7 @@ namespace OpenSim.Data.MySQL | |||
161 | { | 161 | { |
162 | //m_log.Debug("[REGION DB]: Checking connection"); | 162 | //m_log.Debug("[REGION DB]: Checking connection"); |
163 | 163 | ||
164 | long timeNow = System.DateTime.Now.Ticks; | 164 | long timeNow = DateTime.Now.Ticks; |
165 | if (timeNow - m_lastConnectionUse > m_waitTimeout || dbcon.State != ConnectionState.Open) | 165 | if (timeNow - m_lastConnectionUse > m_waitTimeout || dbcon.State != ConnectionState.Open) |
166 | { | 166 | { |
167 | m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting"); | 167 | m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting"); |