diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 7687741049..45a5d2ca42 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -926,7 +926,7 @@ namespace OpenRA.Server DispatchServerOrdersToClients(Order.FromTargetString("Message", text, true)); if (Type == ServerType.Dedicated) - Console.WriteLine($"[{DateTime.Now.ToString(Settings.TimestampFormat)}] {text}"); + WriteLineWithTimeStamp(text); } public void SendLocalizedMessage(string key, Dictionary arguments = null) @@ -935,7 +935,7 @@ namespace OpenRA.Server DispatchServerOrdersToClients(Order.FromTargetString("LocalizedMessage", text, true)); if (Type == ServerType.Dedicated) - Console.WriteLine($"[{DateTime.Now.ToString(Settings.TimestampFormat)}] {ModData.Translation.GetFormattedMessage(key, arguments)}"); + WriteLineWithTimeStamp(ModData.Translation.GetFormattedMessage(key, arguments)); } public void SendLocalizedMessageTo(Connection conn, string key, Dictionary arguments = null) @@ -944,6 +944,11 @@ namespace OpenRA.Server DispatchOrdersToClient(conn, 0, 0, Order.FromTargetString("LocalizedMessage", text, true).Serialize()); } + void WriteLineWithTimeStamp(string line) + { + Console.WriteLine($"[{DateTime.Now.ToString(Settings.TimestampFormat)}] {line}"); + } + void InterpretServerOrder(Connection conn, Order o) { lock (LobbyInfo) @@ -1278,7 +1283,7 @@ namespace OpenRA.Server { lock (LobbyInfo) { - Console.WriteLine($"[{DateTime.Now.ToString(Settings.TimestampFormat)}] Game started"); + WriteLineWithTimeStamp("Game started"); // Drop any players who are not ready foreach (var c in Conns.Where(c => !c.Validated || GetClient(c).IsInvalid).ToArray()) diff --git a/OpenRA.Server/Program.cs b/OpenRA.Server/Program.cs index 6449c1a2c7..1e6fcd805d 100644 --- a/OpenRA.Server/Program.cs +++ b/OpenRA.Server/Program.cs @@ -78,7 +78,7 @@ namespace OpenRA.Server var mods = new InstalledMods(modSearchPaths, explicitModPaths); - Console.WriteLine("[{0}] Starting dedicated server for mod: {1}", DateTime.Now.ToString(settings.TimestampFormat), modID); + WriteLineWithTimeStamp($"Starting dedicated server for mod: {modID}"); while (true) { // HACK: The engine code *still* assumes that Game.ModData is set @@ -96,15 +96,20 @@ namespace OpenRA.Server Thread.Sleep(1000); if (server.State == ServerState.GameStarted && server.Conns.Count < 1) { - Console.WriteLine("[{0}] No one is playing, shutting down...", DateTime.Now.ToString(settings.TimestampFormat)); + WriteLineWithTimeStamp("No one is playing, shutting down..."); server.Shutdown(); break; } } modData.Dispose(); - Console.WriteLine("[{0}] Starting a new server instance...", DateTime.Now.ToString(settings.TimestampFormat)); + WriteLineWithTimeStamp("Starting a new server instance..."); } } + + static void WriteLineWithTimeStamp(string line) + { + Console.WriteLine($"[{DateTime.Now.ToString(Game.Settings.Server.TimestampFormat)}] {line}"); + } } }