Possible 'fix' for internal.db access errors

Author: ccw808

Server/mods/deathmatch/logic/CAccountManager.cpp

@@ -22,16 +22,11 @@ CAccountManager::CAccountManager ( const SString& strDbPathFilename )
     m_bChangedSinceSaved = false;
     m_iAccounts = 1;
     m_pDatabaseManager = g_pGame->GetDatabaseManager ();
+    m_strDbPathFilename = strDbPathFilename;
+    m_hDbConnection = INVALID_DB_HANDLE;
 
     //Load internal.db
-    SString strOptions;
-#ifdef WITH_ACCOUNT_QUERY_LOGGING
-    g_pGame->GetDatabaseManager ()->SetLogLevel ( EJobLogLevel::ALL, g_pGame->GetConfig ()->GetDbLogFilename () );
-    SetOption < CDbOptionsMap > ( strOptions, "log", 1 );
-    SetOption < CDbOptionsMap > ( strOptions, "tag", "accounts" );
-#endif
-    SetOption < CDbOptionsMap > ( strOptions, "queue", DB_SQLITE_QUEUE_NAME_INTERNAL );
-    m_hDbConnection = m_pDatabaseManager->Connect ( "sqlite", PathConform ( strDbPathFilename ), "", "", strOptions );
+    ReconnectToDatabase();
 
     // Check if new installation
     CRegistryResult result;
@@ -119,6 +114,25 @@ CAccountManager::~CAccountManager ( void )
 }
 
 
+void CAccountManager::ReconnectToDatabase(void)
+{
+    if (m_hDbConnection != INVALID_DB_HANDLE)
+    {
+        m_pDatabaseManager->Disconnect(m_hDbConnection);
+    }
+
+    //Load internal.db
+    SString strOptions;
+#ifdef WITH_ACCOUNT_QUERY_LOGGING
+    g_pGame->GetDatabaseManager ()->SetLogLevel ( EJobLogLevel::ALL, g_pGame->GetConfig ()->GetDbLogFilename () );
+    SetOption < CDbOptionsMap > ( strOptions, "log", 1 );
+    SetOption < CDbOptionsMap > ( strOptions, "tag", "accounts" );
+#endif
+    SetOption < CDbOptionsMap > ( strOptions, "queue", DB_SQLITE_QUEUE_NAME_INTERNAL );
+    m_hDbConnection = m_pDatabaseManager->Connect ( "sqlite", PathConform ( m_strDbPathFilename ), "", "", strOptions );
+}
+
+
 void CAccountManager::DoPulse ( void )
 {
     // Save it only once in a while whenever something has changed
@@ -926,8 +940,16 @@ void CAccountManager::DbCallback ( CDbJobData* pJobData )
 {
     if ( m_pDatabaseManager->QueryPoll ( pJobData, 0 ) )
     {
-        if ( pJobData->result.status == EJobResult::FAIL ) 
+        if ( pJobData->result.status == EJobResult::FAIL )
+        {
             CLogger::LogPrintf ( "ERROR: While updating account with '%s': %s.\n", *pJobData->command.strData, *pJobData->result.strReason );
+            if (pJobData->result.strReason.ContainsI("missing database"))
+            {
+                // Try reconnection
+                CLogger::LogPrintf("INFO: Reconnecting to accounts database\n");
+                ReconnectToDatabase();
+            }
+        }
     }
     else
     {

Server/mods/deathmatch/logic/CAccountManager.h

@@ -164,6 +164,7 @@ class CAccountManager
     void                        ChangingName                ( CAccount* pAccount, const SString& strOldName, const SString& strNewName );
     void                        LoadAccountSerialUsage      ( CAccount* pAccount );
     void                        SaveAccountSerialUsage      ( CAccount* pAccount );
+    void                        ReconnectToDatabase         (void);
 
 public:
     void                        RemoveAll                   ( void );
@@ -185,6 +186,7 @@ class CAccountManager
     SDbConnectionId             m_hDbConnection;
     CDatabaseManager*           m_pDatabaseManager;
     int                         m_iAccounts;
+    SString                     m_strDbPathFilename;
 };