epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upload.php now groups log files into zip files by game ID.

Browse Source
This commit is contained in:
Matthew Bowra-Dean
2010-05-29 00:34:40 +12:00
parent fd014e15a5
commit 5f48577ebc
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Support/Program.cs
View File

@@ -49,12 +49,12 @@ namespace OpenRA
catch( Exception e ) catch( Exception e )
{ {
Log.Write( "{0}", e.ToString() ); Log.Write( "{0}", e.ToString() );
UploadLog(Game.MasterGameID); UploadLog();
throw; throw;
} }
} }
static void UploadLog(int gameId) static void UploadLog()
{ {
Log.Close(); Log.Close();
var logfile = File.OpenRead(Log.Filename); var logfile = File.OpenRead(Log.Filename);
@@ -71,13 +71,13 @@ namespace OpenRA
request.ContentType = "application/x-gzip"; request.ContentType = "application/x-gzip";
request.ContentLength = buffer.Length; request.ContentLength = buffer.Length;
request.Method = "POST"; request.Method = "POST";
request.Headers.Add("Game-ID", gameId.ToString()); request.Headers.Add("Game-ID", Game.MasterGameID.ToString());
using (var requestStream = request.GetRequestStream()) using (var requestStream = request.GetRequestStream())
requestStream.Write(buffer, 0, buffer.Length); requestStream.Write(buffer, 0, buffer.Length);
var response = (HttpWebResponse)request.GetResponse(); var response = (HttpWebResponse)request.GetResponse();
MessageBox.Show(response.GetResponseStream().ReadAllText()); MessageBox.Show("{0} {1}:{2}".F(Game.MasterGameID, Game.CurrentHost, Game.CurrentPort));
} }
static void Run( string[] args ) static void Run( string[] args )

2
OpenRA.Gl/GraphicsDevice.cs
View File

@@ -213,6 +213,8 @@ namespace OpenRA.GlRenderer
Game.HandleKeyPress(new KeyPressEventArgs(keyName[0]), mods); Game.HandleKeyPress(new KeyPressEventArgs(keyName[0]), mods);
else if (keyName == "f4" && ((mods & Modifiers.Alt) != 0)) else if (keyName == "f4" && ((mods & Modifiers.Alt) != 0))
OpenRA.Game.Exit(); OpenRA.Game.Exit();
else if (keyName == "f5")
throw new Exception("F5 Pressed.");
} }
} break; } break;

24
web/logs/upload.php
View File

@@ -1,19 +1,19 @@
<?php <?php
$post_file = fopen('php://input', 'rb'); $post_file = fopen('compress.zlib://php://input', 'rb');
$log_file = fopen('log.'.time().'.gz', 'wb');
$game_id = $_SERVER['HTTP_GAME_ID'];
$log_zip = new ZipArchive();
$log_zip->open($game_id.'.zip', ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE);
$post_data = ''; $post_data = '';
while (!feof($post_file)) { while (!feof($post_file))
$post_data .= fread($post_file, 8192); $post_data .= fread($post_file, 8192);
}
fwrite($log_file, $post_data);
$log_zip->addFromString(md5($_SERVER['REMOTE_ADDR']).'.log',$post_data);
fclose($post_file); fclose($post_file);
fclose($log_file); $log_zip->close();
foreach ($_SERVER as $key=>$value)
{
echo $key.': '.$value.'\n';
}
?> ?>