Changeset 329

Timestamp:

Apr 9, 2008, 4:48:09 PM (17 years ago)

Author:

george

Message:

Upraveno: Optimalizace a opravy systému zaznamenávání ladících informací o pádech serveru.

Location:

administrace

Files:

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

administrace/debug_list.php

@@ -8 +8 @@
 }
 
-echo('<table><tr><td width="150px" valign="top">');
+echo('<table width="100%"><tr><td width="150px" valign="top">');
+echo('<strong>Restart list</strong><br>');
 
 $DbResult = $Database->query('SELECT Id, Time FROM debug WHERE 1 ORDER BY Time DESC');
 while($DbRow = $DbResult->fetch_array())
 {
-  echo('<a href="?Id='.$DbRow['Id'].'&amp;Show=Backtrace">'.$DbRow['Time'].'</a><br>');
+  echo('<a href="?Id='.$DbRow['Id'].'">'.str_replace(" ", "&nbsp;", $DbRow['Time']).'</a><br>');
 }
 
@@ -31 +32 @@
     echo('<strong>MaxPlayerCount:</strong> '.$DbRow['MaxPlayerCount'].'<br><br>'); 
     echo('<a href="?Id='.$Id.'&amp;Show=Backtrace">Backtrace</a>'.
-      '  <a href="?Id='.$Id.'&amp;Show=Log">Console standard output log</a>'.
-      '  <a href="?Id='.$Id.'&amp;Show=Error">Console error log</a><hr>');
+      '  <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>');
     if(array_key_exists('Show', $_GET))
     {
@@ -39 +41 @@
       {
         case 'Backtrace': 
-          echo('<strong>Backtrace:</strong> <br><pre>'.str_replace("\n", '<br>', $DbRow['Backtrace']).'</pre>');
+          echo('<strong>Backtrace:</strong> <br><pre>'.htmlspecialchars($DbRow['Backtrace']).'</pre>');
           break;
         case 'Log': 
-          echo('<strong>Console standard output log:</strong> <br><pre>'.str_replace("\n", '<br>', $DbRow['Log']).'</pre>');
+          echo('<strong>Console standard output log:</strong> <br><pre>'.htmlspecialchars($DbRow['Log']).'</pre>');
           break;
         case 'Error': 
-          echo('<strong>Console error log:</strong> <br><pre>'.str_replace("\n", '<br>', $DbRow['ErrorLog']).'</pre>');
+          echo('<strong>Console error log:</strong> <br><pre>'.htmlspecialchars($DbRow['ErrorLog']).'</pre>');
+          break;
+        case 'DbErrors': 
+          echo('<strong>Database error log:</strong> <br><pre>'.htmlspecialchars($DbRow['DbErrors']).'</pre>');
           break;
       }

administrace/global.php

@@ -6 +6 @@
 $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';
+
 //$DatabaseHost = $Config['Database']['Host'];
 //$DatabaseUser = '$Config['Database']['User'];

administrace/process_log.php

@@ -1 +1 @@
 <?php
 
+chdir('/var/www/wow/administrace/');
 include('global.php');
 
 $Content = file_get_contents($StdOutLogFile);
 $Lines = explode("\n", $Content);
+$Content = ''; // Free unused memory
 
 // Separate information from log file
@@ -15 +17 @@
 $Backtrace = array_slice($Lines, $Line, count($Lines) - $Line);   // Assume rest of file to be backtrace
 $Backtrace = addslashes(implode("\n", $Backtrace));
+$Lines = '';
 
-$Log = array_slice($Lines, 0, $Line);
-$Log = addslashes(implode("\n", $Log));
-
-$ErrorLog = addslashes(file_get_contents($ErrOutLogFile));
+//$Log = array_slice($Lines, 0, $Line);
+//$Log = addslashes(implode("\n", $Log));
 
 // Get used database version from database
@@ -40 +41 @@
 // Insert data in separate query to partly avoid too long query packet error
 $Database->query('UPDATE `debug` SET Backtrace="'.$Backtrace.'" WHERE Id='.$InsertId);
-echo($Database->error);
+$Backtrace = '';
+//echo($Database->error);
+$Log = addslashes(file_get_contents($MangosLogFile));
 $Database->query('UPDATE `debug` SET Log="'.$Log.'" WHERE Id='.$InsertId);
-echo($Database->error);
-$Database->query('UPDATE `debug` SET ErrorLog="'.$ErrorLog.'" WHERE Id='.$InsertId);
-echo($Database->error);
+//echo($Database->error);
+$Log = addslashes(file_get_contents($ErrOutLogFile));
+$Database->query('UPDATE `debug` SET ErrorLog="'.$Log.'" WHERE Id='.$InsertId);
+//echo($Database->error);
+$Log = addslashes(file_get_contents($MangosDbErrorsLogFile));
+$Database->query('UPDATE `debug` SET DbErrors="'.$Log.'" WHERE Id='.$InsertId);
+//echo($Database->error);
 
 // Clear log files
+unlink($MangosLogFile);
 unlink($StdOutLogFile);
 unlink($ErrOutLogFile);
+unlink($MangosDbErrorsLogFile);
 
 ?>