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

Wrap console logging with time stamp.

Browse Source
This commit is contained in:
Matthias Mailänder
2022-04-17 13:39:20 +02:00
committed by Pavel Penev
parent aaa3b49496
commit fe15748cc0
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/Server/Server.cs
View File

@@ -926,7 +926,7 @@ namespace OpenRA.Server
DispatchServerOrdersToClients(Order.FromTargetString("Message", text, true)); DispatchServerOrdersToClients(Order.FromTargetString("Message", text, true));
if (Type == ServerType.Dedicated) if (Type == ServerType.Dedicated)
Console.WriteLine($"[{DateTime.Now.ToString(Settings.TimestampFormat)}] {text}"); WriteLineWithTimeStamp(text);
} }
public void SendLocalizedMessage(string key, Dictionary<string, object> arguments = null) public void SendLocalizedMessage(string key, Dictionary<string, object> arguments = null)
@@ -935,7 +935,7 @@ namespace OpenRA.Server
DispatchServerOrdersToClients(Order.FromTargetString("LocalizedMessage", text, true)); DispatchServerOrdersToClients(Order.FromTargetString("LocalizedMessage", text, true));
if (Type == ServerType.Dedicated) 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<string, object> arguments = null) public void SendLocalizedMessageTo(Connection conn, string key, Dictionary<string, object> arguments = null)
@@ -944,6 +944,11 @@ namespace OpenRA.Server
DispatchOrdersToClient(conn, 0, 0, Order.FromTargetString("LocalizedMessage", text, true).Serialize()); 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) void InterpretServerOrder(Connection conn, Order o)
{ {
lock (LobbyInfo) lock (LobbyInfo)
@@ -1278,7 +1283,7 @@ namespace OpenRA.Server
{ {
lock (LobbyInfo) lock (LobbyInfo)
{ {
Console.WriteLine($"[{DateTime.Now.ToString(Settings.TimestampFormat)}] Game started"); WriteLineWithTimeStamp("Game started");
// Drop any players who are not ready // Drop any players who are not ready
foreach (var c in Conns.Where(c => !c.Validated || GetClient(c).IsInvalid).ToArray()) foreach (var c in Conns.Where(c => !c.Validated || GetClient(c).IsInvalid).ToArray())

11
OpenRA.Server/Program.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Server
var mods = new InstalledMods(modSearchPaths, explicitModPaths); 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) while (true)
{ {
// HACK: The engine code *still* assumes that Game.ModData is set // HACK: The engine code *still* assumes that Game.ModData is set
@@ -96,15 +96,20 @@ namespace OpenRA.Server
Thread.Sleep(1000); Thread.Sleep(1000);
if (server.State == ServerState.GameStarted && server.Conns.Count < 1) 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(); server.Shutdown();
break; break;
} }
} }
modData.Dispose(); 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}");
}
} }
} }