Changeset 362

Timestamp:

May 21, 2008, 7:56:49 AM (17 years ago)

Author:

george

Message:

Přidáno: Stránkování výpisu restartů. Zaznamenávání mangosd.conf. Rychlé odkazy na vlákna v výpisu backtrace.

Location:

administrace

Files:

• debug_list.php (modified) (4 diffs)
• global.php (modified) (1 diff)
• process_log.php (modified) (1 diff)

administrace/debug_list.php

@@ -8 +8 @@
 }
 
-echo('<table width="100%"><tr><td width="150px" valign="top">');
-echo('<strong>Restart list</strong><br>');
+echo('<table width="100%"><tr><td width="10%" valign="top" style="">');
+echo('<strong>Restart history:</strong><br>');
 
 if(array_key_exists('Id', $_GET)) $Id = addslashes($_GET['Id']);
   else $Id = 0;
+if(array_key_exists('Page', $_GET)) $Page = addslashes($_GET['Page']);
+  else $Page = 0;
 
-$DbResult = $Database->query('SELECT Id, Time FROM debug WHERE 1 ORDER BY Time DESC');
+$DbResult = $Database->query('SELECT COUNT(*) FROM debug');
+$DbRow = $DbResult->fetch_array();
+$Total = $DbRow[0];
+
+$DbResult = $Database->query('SELECT Id, Time FROM debug WHERE 1 ORDER BY Time DESC LIMIT '.($Page * $ItemPerPage).','.$ItemPerPage);
 while($DbRow = $DbResult->fetch_array())
 {
   if($DbRow['Id'] == $Id) echo('<strong>');
-  echo('<a href="?Id='.$DbRow['Id'].'&amp;Show=Backtrace">'.str_replace(" ", "&nbsp;", $DbRow['Time']).'</a>');
+  echo('<a href="?Id='.$DbRow['Id'].'&amp;Page='.$Page.'&amp;Show=Backtrace">'.str_replace(" ", "&nbsp;", $DbRow['Time']).'</a>');
   if($DbRow['Id'] == $Id) echo('</strong>');
   echo('<br>');
 }
+echo(PagesList('?Page=', $Page, $Total, $ItemPerPage, 2));
 
-echo('</td><td valign="top">');
+echo('</td><td valign="top" width="90%">');
 
 if($Id > 0)
@@ -39 +46 @@
       '  <a href="?Id='.$Id.'&amp;Show=Log">Mangos log</a>'.
       '  <a href="?Id='.$Id.'&amp;Show=Error">Console error log</a>'.
-      '  <a href="?Id='.$Id.'&amp;Show=DbErrors">Database error log</a><hr>');
+      '  <a href="?Id='.$Id.'&amp;Show=DbErrors">Database error log</a>'.
+      '  <a href="?Id='.$Id.'&amp;Show=Configuration">Mangos configuration</a>'.
+      '<hr>');
     if(array_key_exists('Show', $_GET))
     {
@@ -45 +54 @@
       switch($Show)
       {
-        case 'Backtrace': 
-          echo('<strong>Backtrace:</strong> <br><pre>'.htmlspecialchars($DbRow['Backtrace']).'</pre>');
+        case 'Backtrace':
+          $Content = htmlspecialchars($DbRow['Backtrace']);
+          for($I = 1; $I < 8; $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);
+          }
+          echo('<strong>Backtrace:</strong> <br><pre>'.$Content.'</pre>');
           break;
         case 'Log': 
@@ -57 +72 @@
           echo('<strong>Database error log:</strong> <br><pre>'.htmlspecialchars($DbRow['DbErrors']).'</pre>');
           break;
+        case 'Configuration': 
+          echo('<strong>Mangos configuration:</strong> <br><pre>'.htmlspecialchars($DbRow['Configuration']).'</pre>');
+          break;
       }
     }

administrace/global.php

@@ -4 +4 @@
 
 // Configuration
+$MangosConfFile = '/a/mangos/etc/mangosd.conf';
 $StdOutLogFile = '/a/log/mangos/mangos-worldd.log';
 $ErrOutLogFile = '/a/log/mangos/mangos-worldd.err';
 $MangosLogFile = '/a/log/mangos/Server.log';
 $MangosDbErrorsLogFile = '/a/log/mangos/DBErrors.log';
+$ItemPerPage = 35;
 
 //$DatabaseHost = $Config['Database']['Host'];

administrace/process_log.php

@@ -53 +53 @@
 //echo($Database->error);
 
+$Log = addslashes(file_get_contents($MangosConfFile));
+$Database->query('UPDATE `debug` SET Configuration="'.$Log.'" WHERE Id='.$InsertId);
+
 // Clear log files
 unlink($MangosLogFile);