From b44d1be55441a891e7b7f6845a7609c822b9bc85 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 21 Sep 2016 04:54:25 +0100 Subject: [PATCH 1/3] Timestamp syncreport and exception log files. --- OpenRA.Game/Network/SyncReport.cs | 3 ++- OpenRA.Game/Support/Program.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/Network/SyncReport.cs b/OpenRA.Game/Network/SyncReport.cs index ccbe5b9625..62068d83ae 100644 --- a/OpenRA.Game/Network/SyncReport.cs +++ b/OpenRA.Game/Network/SyncReport.cs @@ -92,7 +92,8 @@ namespace OpenRA.Network internal void DumpSyncReport(int frame, IEnumerable orders) { - Log.AddChannel("sync", "syncreport.log"); + var reportName = "syncreport-" + DateTime.UtcNow.ToString("yyyy-MM-ddTHHmmssZ") + ".log"; + Log.AddChannel("sync", reportName); foreach (var r in syncReports) { diff --git a/OpenRA.Game/Support/Program.cs b/OpenRA.Game/Support/Program.cs index e2c22647dc..ab422122b8 100644 --- a/OpenRA.Game/Support/Program.cs +++ b/OpenRA.Game/Support/Program.cs @@ -48,7 +48,8 @@ namespace OpenRA static void FatalError(Exception ex) { - Log.AddChannel("exception", "exception.log"); + var exceptionName = "exception-" + DateTime.UtcNow.ToString("yyyy-MM-ddTHHmmssZ") + ".log"; + Log.AddChannel("exception", exceptionName); if (Game.ModData != null) { From bfa0c008eb1cb767934f94b88eefd588f43db98c Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 21 Sep 2016 05:09:16 +0100 Subject: [PATCH 2/3] Restore missing GameUid. --- OpenRA.Game/Server/Server.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 39f5d6bdc4..923a6cc978 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -152,6 +152,7 @@ namespace OpenRA.Server Map = settings.Map, ServerName = settings.Name, EnableSingleplayer = settings.EnableSingleplayer || !dedicated, + GameUid = Guid.NewGuid().ToString() } }; From 94de961175c8eb37aef14032676e957c91f87e3b Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 21 Sep 2016 14:51:53 +0100 Subject: [PATCH 3/3] Converting dates to string using the InvariantCulture. --- OpenRA.Game/Game.cs | 6 +++--- OpenRA.Game/Network/SyncReport.cs | 3 ++- OpenRA.Game/Support/Program.cs | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index aa961f6df2..74f476254e 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -14,6 +14,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Drawing; using System.Drawing.Imaging; +using System.Globalization; using System.IO; using System.Linq; using System.Net; @@ -71,9 +72,8 @@ namespace OpenRA static string TimestampedFilename(bool includemilliseconds = false) { - return includemilliseconds - ? DateTime.UtcNow.ToString("OpenRA-yyyy-MM-ddTHHmmssfffZ") - : DateTime.UtcNow.ToString("OpenRA-yyyy-MM-ddTHHmmssZ"); + var format = includemilliseconds ? "yyyy-MM-ddTHHmmssfffZ" : "yyyy-MM-ddTHHmmssZ"; + return "OpenRA-" + DateTime.UtcNow.ToString(format, CultureInfo.InvariantCulture); } static void JoinInner(OrderManager om) diff --git a/OpenRA.Game/Network/SyncReport.cs b/OpenRA.Game/Network/SyncReport.cs index 62068d83ae..6959d05ced 100644 --- a/OpenRA.Game/Network/SyncReport.cs +++ b/OpenRA.Game/Network/SyncReport.cs @@ -18,6 +18,7 @@ using OpenRA.Primitives; namespace OpenRA.Network { + using System.Globalization; using NamesValuesPair = Pair; class SyncReport @@ -92,7 +93,7 @@ namespace OpenRA.Network internal void DumpSyncReport(int frame, IEnumerable orders) { - var reportName = "syncreport-" + DateTime.UtcNow.ToString("yyyy-MM-ddTHHmmssZ") + ".log"; + var reportName = "syncreport-" + DateTime.UtcNow.ToString("yyyy-MM-ddTHHmmssZ", CultureInfo.InvariantCulture) + ".log"; Log.AddChannel("sync", reportName); foreach (var r in syncReports) diff --git a/OpenRA.Game/Support/Program.cs b/OpenRA.Game/Support/Program.cs index ab422122b8..60e374f81b 100644 --- a/OpenRA.Game/Support/Program.cs +++ b/OpenRA.Game/Support/Program.cs @@ -11,6 +11,7 @@ using System; using System.Diagnostics; +using System.Globalization; using System.Linq; using System.Reflection; using System.Text; @@ -48,7 +49,7 @@ namespace OpenRA static void FatalError(Exception ex) { - var exceptionName = "exception-" + DateTime.UtcNow.ToString("yyyy-MM-ddTHHmmssZ") + ".log"; + var exceptionName = "exception-" + DateTime.UtcNow.ToString("yyyy-MM-ddTHHmmssZ", CultureInfo.InvariantCulture) + ".log"; Log.AddChannel("exception", exceptionName); if (Game.ModData != null)