From 4b0aa77ce514b19ff6480acd3a28026969e0d7f1 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 2 Apr 2016 17:09:52 +0100 Subject: [PATCH 1/2] Add missing timestamp to dedicated server logs. --- OpenRA.Game/Server/Server.cs | 2 +- OpenRA.Server/Program.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 3806c40c84..f81203677a 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -689,7 +689,7 @@ namespace OpenRA.Server { listener.Stop(); - Console.WriteLine("Game started"); + Console.WriteLine("[{0}] Game started", DateTime.Now.ToString(Settings.TimestampFormat)); // Drop any unvalidated clients foreach (var c in PreConns.ToArray()) diff --git a/OpenRA.Server/Program.cs b/OpenRA.Server/Program.cs index b843618dde..61372c953d 100644 --- a/OpenRA.Server/Program.cs +++ b/OpenRA.Server/Program.cs @@ -35,7 +35,7 @@ namespace OpenRA.Server settings.Map = modData.MapCache.ChooseInitialMap(settings.Map, new MersenneTwister()); - Console.WriteLine("Starting dedicated server for mod: " + mod); + Console.WriteLine("[{0}] Starting dedicated server for mod: {1}", DateTime.Now.ToString(settings.TimestampFormat), mod); while (true) { var server = new Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, modData, true); @@ -45,13 +45,13 @@ namespace OpenRA.Server Thread.Sleep(1000); if (server.State == ServerState.GameStarted && server.Conns.Count < 1) { - Console.WriteLine("No one is playing, shutting down..."); + Console.WriteLine("[{0}] No one is playing, shutting down...", DateTime.Now.ToString(settings.TimestampFormat)); server.Shutdown(); break; } } - Console.WriteLine("Starting a new server instance..."); + Console.WriteLine("[{0}] Starting a new server instance...", DateTime.Now.ToString(settings.TimestampFormat)); } } } From a79f40bf4b0eb6f58181b941fde8145c7a799a84 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 2 Apr 2016 17:10:00 +0100 Subject: [PATCH 2/2] Log all player joins on dedicated servers. --- OpenRA.Game/Server/Server.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index f81203677a..a21e5fd497 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -375,7 +375,7 @@ namespace OpenRA.Server Log.Write("server", "{0} ({1}) has joined the game.", client.Name, newConn.Socket.RemoteEndPoint); - if (!LobbyInfo.IsSinglePlayer) + if (Dedicated || !LobbyInfo.IsSinglePlayer) SendMessage("{0} has joined the game.".F(client.Name)); // Send initial ping