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

Merge pull request #11025 from pchote/fix-dedicated-logging

Browse Source 
Improve log output on dedicated servers.
This commit is contained in:
Oliver Brakmann
2016-04-02 18:30:32 +02:00
parent ce7488f457 a79f40bf4b
commit a29b9ff7be
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,7 +375,7 @@ namespace OpenRA.Server
Log.Write("server", "{0} ({1}) has joined the game.", Log.Write("server", "{0} ({1}) has joined the game.",
client.Name, newConn.Socket.RemoteEndPoint); client.Name, newConn.Socket.RemoteEndPoint);
if (!LobbyInfo.IsSinglePlayer) if (Dedicated || !LobbyInfo.IsSinglePlayer)
SendMessage("{0} has joined the game.".F(client.Name)); SendMessage("{0} has joined the game.".F(client.Name));
// Send initial ping // Send initial ping
@@ -689,7 +689,7 @@ namespace OpenRA.Server
{ {
listener.Stop(); listener.Stop();
Console.WriteLine("Game started"); Console.WriteLine("[{0}] Game started", DateTime.Now.ToString(Settings.TimestampFormat));
// Drop any unvalidated clients // Drop any unvalidated clients
foreach (var c in PreConns.ToArray()) foreach (var c in PreConns.ToArray())

6
OpenRA.Server/Program.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Server
settings.Map = modData.MapCache.ChooseInitialMap(settings.Map, new MersenneTwister()); 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) while (true)
{ {
var server = new Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, modData, true); var server = new Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, modData, true);
@@ -45,13 +45,13 @@ 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("No one is playing, shutting down..."); Console.WriteLine("[{0}] No one is playing, shutting down...", DateTime.Now.ToString(settings.TimestampFormat));
server.Shutdown(); server.Shutdown();
break; break;
} }
} }
Console.WriteLine("Starting a new server instance..."); Console.WriteLine("[{0}] Starting a new server instance...", DateTime.Now.ToString(settings.TimestampFormat));
} }
} }
} }