Changeset 62

Timestamp:

Aug 5, 2009, 7:30:23 AM (15 years ago)

Author:

george

Message:

• Opraveno: Při aktualizaci realmu neanačítat soubory databáze serveru a naopak.
• Opraveno: Zobrazování podstránek ladících výstupů realmů.

Location:

trunk/www

Files:

• index.php (modified) (2 diffs)
• model/mangos_debug.php (modified) (4 diffs)
• model/realm.php (modified) (5 diffs)
• model/server.php (modified) (3 diffs)
• view/debug.php (modified) (3 diffs)
• view/realm.php (modified) (1 diff)

trunk/www/index.php

@@ -142 +142 @@
         $Output .= $EmulatorView->AddFinish();
       } else      
-      if($_GET['Action'] == 'ServerDebug')
-      {
-        $DebugView = new DebugView($this->Database, $this->System);
-        $Output .= $DebugView->Item();
-      } else      
       if($_GET['Action'] == 'ClientList')
       {
@@ -157 +152 @@
         $Output .= $BackupView->ItemList();
       } else     
+      if($_GET['Action'] == 'DebugView')
+      {
+        $DebugView = new DebugView($this->Database, $this->System);
+        $Output .= $DebugView->Item();
+      } else      
       if($_GET['Action'] == 'DebugList')
       {

trunk/www/model/mangos_debug.php

@@ -9 +9 @@
   {
     $this->Database = $Database;
-  }
+  } 
   
-  function Show($ServerId)
-  {
-    global $System;
-    
-    $Output = '';
-    $Form = new Form('DebugItem');
-    if($Form->LoadValuesFromDatabase($_GET['Id']))
-    {
-        $Form->Values['Uptime'] = TimeToHumanTime($Form->Values['Uptime']);
-        $Output .= $Form->ShowTable();
-      
-        $Output .= '<a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Backtrace">Backtrace</a>'.
-          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Log">Mangos log</a>'.
-          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Error">Console error log</a>'.
-          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=DbErrors">Database error log</a>'.
-          '  <a href="?Action=ServerDebug&amp;Id='.$_GET['Id'].'&amp;Show=Configuration">Mangos configuration</a>'.
-          '<hr>';
-        if(array_key_exists('Show', $_GET))
-        {
-          $Show = addslashes($_GET['Show']);     
-          switch($Show)
-          {
-            case 'Backtrace':
-              $DbResult = $this->Database->select('Debug', 'Backtrace', 'Id='.$_GET['Id']);
-              $DbRow = $DbResult->fetch_assoc();
-              $Content = htmlspecialchars($DbRow['Backtrace']);
-              for($I = 1; $I < $this->MaxMangosThreadCount; $I++)
-              {
-                $Content = str_replace('Thread '.$I.' ', '<hr><strong id="'.$I.'">Thread '.$I.'</strong>', $Content);
-                $Content = str_replace(' '.$I.' Thread ', '<a href="#'.$I.'"">'.$I.' Thread</a>', $Content);
-              }
-              $Output .= '<strong>Backtrace:</strong> <br><pre>'.$Content.'</pre>';
-              break;
-            case 'Log': 
-              $DbResult = $this->Database->select('Debug', 'Log', 'Id='.$_GET['Id']);
-              $DbRow = $DbResult->fetch_assoc();
-              $Output .= '<strong>Console standard output log:</strong> <br><pre>'.htmlspecialchars($DbRow['Log']).'</pre>';
-              break;
-            case 'Error': 
-              $DbResult = $this->Database->select('Debug', 'ErrorLog', 'Id='.$_GET['Id']);
-              $DbRow = $DbResult->fetch_assoc();
-              $Output .= '<strong>Console error log:</strong> <br><pre>'.htmlspecialchars($DbRow['ErrorLog']).'</pre>';
-              break;
-            case 'DbErrors': 
-              $DbResult = $this->Database->select('Debug', 'DbErrors', 'Id='.$_GET['Id']);
-              $DbRow = $DbResult->fetch_assoc();
-              $Output .= '<strong>Database error log:</strong> <br><pre>'.htmlspecialchars($DbRow['DbErrors']).'</pre>';
-              break;
-            case 'Configuration': 
-              $DbResult = $this->Database->select('Debug', 'Configuration', 'Id='.$_GET['Id']);
-              $DbRow = $DbResult->fetch_assoc();
-              $Output .= '<strong>Mangos configuration:</strong> <br><pre>'.htmlspecialchars($DbRow['Configuration']).'</pre>';
-              break;
-          }
-        }
-    } else $Output = 'Položka nenalezena';
-    return($Output);
-  }
-  
-  function ProcessLog($ServerId)
+  function ProcessLog()
   {
     global $Config;
@@ -76 +17 @@
     $Output = '';
     // Read server Id from first parameter
-    $ServerId = $_SERVER['argv'][1];
-    $LogDir = '../server/'.$ServerId.'/log/';
-    $MangosConfFile = '../server/'.$ServerId.'/etc/mangosd.conf';
+    $RealmId = $_SERVER['argv'][1];
+    $Realm = new Realm($this->Database, $RealmId);
+    
+    $LogDir = '../realm/'.$RealmId.'/log/';
+    $MangosConfFile = '../realm/'.$RealmId.'/etc/mangosd.conf';
     $StdOutLogFile = $LogDir.'mangos-worldd.log';
     $ErrOutLogFile = $LogDir.'mangos-worldd.err';
@@ -105 +48 @@
   
     // Get used database version from database
-    $DbResult = $this->Database->query('SELECT * FROM `server'.$ServerId.'_mangos`.`db_version`');
+    $DbResult = $this->Database->query('SELECT * FROM `realm'.$RealmId.'_mangos`.`db_version`');
     $DbRow = $DbResult->fetch_array();
     $DbVersion = $DbRow['version'];
-
+    
     // Get last uptime info
-    $DbResult = $this->Database->query('SELECT * FROM `server'.$ServerId.'_realmd`.`uptime` ORDER BY `starttime` DESC LIMIT 1');
+    $DbResult = $this->Database->query('SELECT * FROM `server'.$Realm->Data['Server'].'_realmd`.`uptime` ORDER BY `starttime` DESC LIMIT 1');
     //$Output = $this->Database->error;
     $DbRow = $DbResult->fetch_array();
@@ -117 +60 @@
 
     // Insert data to database
-    $this->Database->query('INSERT INTO `Debug` (`Server`, `Time`, `MangosVersion`, `DbVersion`, `Uptime`, `MaxPlayerCount`) VALUES ('.$ServerId.', NOW(), "'.$MangosVersion.'", "'.$DbVersion.'", '.$Uptime.', '.$MaxPlayerCount.')');
+    $this->Database->query('INSERT INTO `Debug` (`Realm`, `Time`, `MangosVersion`, `DbVersion`, `Uptime`, `MaxPlayerCount`) VALUES ('.$RealmId.', NOW(), "'.$MangosVersion.'", "'.$DbVersion.'", '.$Uptime.', '.$MaxPlayerCount.')');
     $InsertId = $this->Database->insert_id;
 

trunk/www/model/realm.php

@@ -90 +90 @@
     $CommandList = array_merge($CommandList, array(
       'mysql --user=server'.$this->Data['Server'].' --password=server'.$this->Data['Server'].' realm'.$this->Id.'_mangos < database/'.$Database['Id'].'/'.$Database['SourceFileName'],
-      'mysql --user=server'.$this->Data['Server'].' --password=server'.$this->Data['Server'].' realm'.$this->Id.'_scriptdev2 < emulator/'.$Database['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/scriptdev2_create_structure.sql',
-      'mysql --user=server'.$this->Data['Server'].' --password=server'.$this->Data['Server'].' realm'.$this->Id.'_scriptdev2 < emulator/'.$Database['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/scriptdev2_script_full.sql',
-      'mysql --user=server'.$this->Data['Server'].' --password=server'.$this->Data['Server'].' realm'.$this->Id.'_mangos < emulator/'.$Database['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/mangos_scriptname_full.sql',
-      'mysql --user=server'.$this->Data['Server'].' --password=server'.$this->Data['Server'].' realm'.$this->Id.'_characters < emulator/'.$Database['Emulator']['Id'].'/share/mangos/sql/characters.sql',
+      'mysql --user=server'.$this->Data['Server'].' --password=server'.$this->Data['Server'].' realm'.$this->Id.'_scriptdev2 < emulator/'.$Database['Emulator'].'/source/src/bindings/ScriptDev2/sql/scriptdev2_create_structure.sql',
+      'mysql --user=server'.$this->Data['Server'].' --password=server'.$this->Data['Server'].' realm'.$this->Id.'_scriptdev2 < emulator/'.$Database['Emulator'].'/source/src/bindings/ScriptDev2/sql/scriptdev2_script_full.sql',
+      'mysql --user=server'.$this->Data['Server'].' --password=server'.$this->Data['Server'].' realm'.$this->Id.'_mangos < emulator/'.$Database['Emulator'].'/source/src/bindings/ScriptDev2/sql/mangos_scriptname_full.sql',
+      'mysql --user=server'.$this->Data['Server'].' --password=server'.$this->Data['Server'].' realm'.$this->Id.'_characters < emulator/'.$Database['Emulator'].'/share/mangos/sql/characters.sql',
       'php www/shell.php RealmDatabaseChange '.$this->Id.' '.$Database['Id'],
       'php www/shell.php RealmUnLock '.$this->Id,
@@ -182 +182 @@
       'while [ 1=1 ] ; do',
       'gdb emulator/'.$this->Data['Database']['Emulator']['Id'].'/bin/mangos-worldd -x realm/'.$this->Id.'/bin/mangos.gdb --batch >>realm/'.$this->Id.'/log/mangos-worldd.log 2>>realm/'.$this->Id.'/log/mangos-worldd.err',
-      'cd www',
-      'php shell.php ServerProcessLog '.$this->Id.' >>realm/'.$this->Id.'/log/mangos_debug.log 2>>realm/'.$this->Id.'/log/mangos_debug.err',
-      'cd ..',
+      'php www/shell.php ServerProcessLog '.$this->Id.' >>realm/'.$this->Id.'/log/mangos_debug.log 2>>realm/'.$this->Id.'/log/mangos_debug.err',
       'sleep 3',
       'done',
@@ -215 +213 @@
     $EmulatorConfig = new MangosConfigurationFile($this->Database);
     $EmulatorConfig->Load($EmulatorEtcDir.'mangosd.conf.dist');
-    $EmulatorConfig->ParameterList['LoginDatabaseInfo'] = 'localhost;3306;server'.$this->Id.';server'.$this->Id.';server'.$this->Id.'_realmd';
-    $EmulatorConfig->ParameterList['WorldDatabaseInfo'] = 'localhost;3306;server'.$this->Id.';server'.$this->Id.';server'.$this->Id.'_mangos';
+    $EmulatorConfig->ParameterList['LoginDatabaseInfo'] = 'localhost;3306;server'.$this->Id.';server'.$this->Id.';server'.$this->Data['Server'].'_realmd';
+    $EmulatorConfig->ParameterList['WorldDatabaseInfo'] = 'localhost;3306;server'.$this->Id.';server'.$this->Id.';realm'.$this->Id.'_mangos';
     $EmulatorConfig->ParameterList['CharacterDatabaseInfo'] = 'localhost;3306;server'.$this->Data['Server'].';server'.$this->Data['Server'].';realm'.$this->Id.'_characters';
     $EmulatorConfig->ParameterList['ScriptDev2DatabaseInfo'] = 'localhost;3306;server'.$this->Data['Server'].';server'.$this->Data['Server'].';realm'.$this->Id.'_scriptdev2';
@@ -258 +256 @@
     // Do update
     $Commands = array(
-     'php www/shell.php RealmLock '.$this->Id,
+      'php www/shell.php RealmLock '.$this->Id,
     );
     $DbResult = $this->Database->query('SELECT `Revision` FROM `Database` WHERE `Id` = '.$this->Data['Database']['Id']);
@@ -274 +272 @@
       {
         $Parts = explode('|', $Update); 
-        $Command = 'mysql --user=server'.$this->Data['Server'].' --password=server'.$this->Data['Server'].' realm'.$this->Id.'_'.$Parts[0].' < database/'.$DbRow['Id'].'/'.$Parts[1];
+        if($Parts[0] != 'realmd')
+          $Command = 'mysql --user=server'.$this->Data['Server'].' --password=server'.$this->Data['Server'].' realm'.$this->Id.'_'.$Parts[0].' < database/'.$DbRow['Id'].'/'.$Parts[1];
         $Commands[] = $Command;
       }     

trunk/www/model/server.php

@@ -40 +40 @@
     $this->Database->query('DROP USER "server'.$this->Id.'"@"localhost"');
   }
-  
-  function ImportDatabase($Delete = false)
-  {
-    $this->Lock();
-    $CommandList = array(
-      'php www/shell.php ServerLock '.$this->Id,
-    );
-    if($Delete == true) 
-    {
-      $CommandList = array_merge($CommandList, array(
-      'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd',
-      ));
-    }
-    // Lookup nearest database with full import
-    $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE (`Emulator` <> 0) AND (`Revision` <= '.$this->Server['Database']['Revision'].') AND (`SourceFileName` <> "") ORDER BY `Revision` DESC');
-    $Database = $DbResult->fetch_assoc();
-    
-    $CommandList = array_merge($CommandList, array(
-      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_realmd < emulator/'.$Database['Emulator']['Id'].'/share/mangos/sql/realmd.sql',
-      'php www/shell.php ServerDatabaseChange '.$this->Id.' '.$Database['Id'],
-      'php www/shell.php ServerUnLock '.$this->Id,
-    ));    
-    $this->Task->Add('Inicializace databáze', $CommandList);
-    
-    if($Database['Id'] != $this->Server['Database']['Id']) 
-    {
-      $NewDatabaseId = $this->Server['Database']['Id'];
-      $this->Server['Database']['Id'] = $Database['Id'];
-      $this->Update($NewDatabaseId, false, false);
-    }
-    return('Úloha načtení nové databáze zařazena do fronty.');
-  } 
   
   function Start()
@@ -228 +196 @@
   }
   
+  function ImportDatabase($Delete = false)
+  {
+    $this->Lock();
+    $CommandList = array(
+      'php www/shell.php ServerLock '.$this->Id,
+    );
+    if($Delete == true) 
+    {
+      $CommandList = array_merge($CommandList, array(
+      'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd',
+      ));
+    }
+    // Lookup nearest database with full import
+    $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE (`Emulator` <> 0) AND (`Revision` <= '.$this->Server['Database']['Revision'].') AND (`SourceFileName` <> "") ORDER BY `Revision` DESC');
+    $Database = $DbResult->fetch_assoc();
+    
+    $CommandList = array_merge($CommandList, array(
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_realmd < emulator/'.$Database['Emulator']['Id'].'/share/mangos/sql/realmd.sql',
+      'php www/shell.php ServerDatabaseChange '.$this->Id.' '.$Database['Id'],
+      'php www/shell.php ServerUnLock '.$this->Id,
+    ));    
+    $this->Task->Add('Inicializace databáze', $CommandList);
+    
+    if($Database['Id'] != $this->Server['Database']['Id']) 
+    {
+      $NewDatabaseId = $this->Server['Database']['Id'];
+      $this->Server['Database']['Id'] = $Database['Id'];
+      $this->Update($NewDatabaseId, false, false);
+    }
+    return('Úloha načtení nové databáze zařazena do fronty.');
+  } 
+
   function Update($DatabaseId, $DoBackup = true, $DoStop = true)
   {
@@ -264 +264 @@
       {
         $Parts = explode('|', $Update); 
-        $Command = 'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_'.$Parts[0].' < database/'.$DbRow['Id'].'/'.$Parts[1];
+        if($Parts[0] == 'realmd')
+          $Command = 'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_'.$Parts[0].' < database/'.$DbRow['Id'].'/'.$Parts[1];
         $Commands[] = $Command;
       }     

trunk/www/view/debug.php

@@ -28 +28 @@
   function ShowListOnRow($Row)
   {
-    $Row['Time'] = '<a href="?Action=ServerDebug&amp;Id='.$Row['Id'].'&amp;Show=Backtrace">'.str_replace(' ', '&nbsp;', $Row['Time']).'</a>';
+    $Row['Time'] = '<a href="?Action=DebugView&amp;Id='.$Row['Id'].'&amp;Show=Backtrace">'.str_replace(' ', '&nbsp;', $Row['Time']).'</a>';
     $Row['Uptime'] = TimeToHumanTime($Row['Uptime']);
     return($Row);
@@ -39 +39 @@
     if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
     {
-      $Server = new Server($this->Database, $_GET['Id']);
-      if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
+      $Realm = new Realm($this->Database, $_GET['Id']);
+      if(($this->System->Modules['User']->User['Id'] == $Realm->GetUser()) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
         $Output = '<h4>Ladící záznamy restartů</h4>';
         $Table = new Table($this->ItemListFormClass);
         $Table->OnRow = array($this, 'ShowListOnRow');
-        $Table->Definition['Table'] = '(SELECT * FROM Debug WHERE Server='.$_GET['Id'].')';
+        $Table->Definition['Table'] = '(SELECT * FROM Debug WHERE Realm='.$_GET['Id'].')';
         $Table->LoadValuesFromDatabase($this->Database);
         $Output .= $Table->Show();
@@ -59 +59 @@
   function Item()
   {
+    global $System;
+
     if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
     {
-      $Server = new Server($this->Database, $_GET['Id']);
-      if(($this->System->Modules['User']->User['Id'] == $Server->Server['User']) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
+      $Realm = new Realm($this->Database, $_GET['Id']);
+      if(($this->System->Modules['User']->User['Id'] == $Realm->GetUser()) or ($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR))
       {
         $Output = '<div>Ladící informace serveru</div>'; 
-        $MangosDebug = new MangosDebug($this->Database);
-        $Output .= $MangosDebug->Show($Server->Id);
+    
+    $MangosDebug = new MangosDebug($this->Database, $this->System);
+    $Form = new Form($this->ItemFormClass);
+    if($Form->LoadValuesFromDatabase($_GET['Id']))
+    {
+        $Form->Values['Uptime'] = TimeToHumanTime($Form->Values['Uptime']);
+        $Output .= $Form->ShowTable();
+      
+        $Output .= '<a href="?Action=DebugView&amp;Id='.$_GET['Id'].'&amp;Show=Backtrace">Backtrace</a>'.
+          '  <a href="?Action=DebugView&amp;Id='.$_GET['Id'].'&amp;Show=Log">Mangos log</a>'.
+          '  <a href="?Action=DebugView&amp;Id='.$_GET['Id'].'&amp;Show=Error">Console error log</a>'.
+          '  <a href="?Action=DebugView&amp;Id='.$_GET['Id'].'&amp;Show=DbErrors">Database error log</a>'.
+          '  <a href="?Action=DebugView&amp;Id='.$_GET['Id'].'&amp;Show=Configuration">Mangos configuration</a>'.
+          '<hr>';
+        if(array_key_exists('Show', $_GET))
+        {
+          $Show = addslashes($_GET['Show']);     
+          switch($Show)
+          {
+            case 'Backtrace':
+              $DbResult = $this->Database->select('Debug', 'Backtrace', 'Id='.$_GET['Id']);
+              $DbRow = $DbResult->fetch_assoc();
+              $Content = htmlspecialchars($DbRow['Backtrace']);
+              for($I = 1; $I < $MangosDebug->MaxMangosThreadCount; $I++)
+              {
+                $Content = str_replace('Thread '.$I.' ', '<hr><strong id="'.$I.'">Thread '.$I.'</strong>', $Content);
+                $Content = str_replace(' '.$I.' Thread ', '<a href="#'.$I.'"">'.$I.' Thread</a>', $Content);
+              }
+              $Output .= '<strong>Backtrace:</strong> <br><pre>'.$Content.'</pre>';
+              break;
+            case 'Log': 
+              $DbResult = $this->Database->select('Debug', 'Log', 'Id='.$_GET['Id']);
+              $DbRow = $DbResult->fetch_assoc();
+              $Output .= '<strong>Console standard output log:</strong> <br><pre>'.htmlspecialchars($DbRow['Log']).'</pre>';
+              break;
+            case 'Error': 
+              $DbResult = $this->Database->select('Debug', 'ErrorLog', 'Id='.$_GET['Id']);
+              $DbRow = $DbResult->fetch_assoc();
+              $Output .= '<strong>Console error log:</strong> <br><pre>'.htmlspecialchars($DbRow['ErrorLog']).'</pre>';
+              break;
+            case 'DbErrors': 
+              $DbResult = $this->Database->select('Debug', 'DbErrors', 'Id='.$_GET['Id']);
+              $DbRow = $DbResult->fetch_assoc();
+              $Output .= '<strong>Database error log:</strong> <br><pre>'.htmlspecialchars($DbRow['DbErrors']).'</pre>';
+              break;
+            case 'Configuration': 
+              $DbResult = $this->Database->select('Debug', 'Configuration', 'Id='.$_GET['Id']);
+              $DbRow = $DbResult->fetch_assoc();
+              $Output .= '<strong>Mangos configuration:</strong> <br><pre>'.htmlspecialchars($DbRow['Configuration']).'</pre>';
+              break;
+          }
+        }
+    } else $Output = 'Položka nenalezena';
       } else $this->SystemMessage('Ladící informace', 'Nemáte oprávnění');
     } else $Output = USER_BAD_ROLE;
     return($Output);
-  }  
+  }
 }
 

trunk/www/view/realm.php

@@ -157 +157 @@
         $Output .= ' <a href="?Action=RealmEditDetailed&amp;Id='.$Realm->Id.'">Upravit podrobné nastavení</a>';
       }
+      $Output .= ' <a href="?Action=DebugList&amp;Id='.$Realm->Id.'">Ladící informace</a>';
       //$Output .= ' <a href="?Action=ServerDatabaseImport&amp;Id='.$Server->Id.'">Načtení čisté databáze</a>';
     }