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 ccbe5b9625..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,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", CultureInfo.InvariantCulture) + ".log"; + Log.AddChannel("sync", reportName); foreach (var r in syncReports) { diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 6f1f159040..8d89ce7bd2 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() } }; diff --git a/OpenRA.Game/Support/Program.cs b/OpenRA.Game/Support/Program.cs index e2c22647dc..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,8 @@ namespace OpenRA static void FatalError(Exception ex) { - Log.AddChannel("exception", "exception.log"); + var exceptionName = "exception-" + DateTime.UtcNow.ToString("yyyy-MM-ddTHHmmssZ", CultureInfo.InvariantCulture) + ".log"; + Log.AddChannel("exception", exceptionName); if (Game.ModData != null) {