Merge branch 'general-devel' of github.com:Pryaxis/TSAPI into general-devel

Author: hakusaro

TerrariaServerAPI/TerrariaApi.Server/LogWriterManager.cs

@@ -17,13 +17,20 @@ internal ILogWriter WrappedLogWriter
 		}
 		public string LogWriterName
 		{
-			get { return this.WrappedLogWriter.Name; }
+			get { return this.WrappedLogWriter?.Name; }
 		}
 
-		internal LogWriterManager()
+		/// <param name="enabled">
+		/// If set to false, no default log writer will be set at first, but a new one can be added with
+		/// <see cref="Attach(ILogWriter)"/> later.
+		/// </param>
+		internal LogWriterManager(bool enabled)
 		{
-			this.DefaultLogWriter = new ServerLogWriter();
-			this.WrappedLogWriter = this.DefaultLogWriter;
+			if (enabled)
+			{
+				this.DefaultLogWriter = new ServerLogWriter();
+				this.WrappedLogWriter = this.DefaultLogWriter;
+			}
 		}
 
 		public void Attach(ILogWriter newLogWriter)
@@ -57,7 +64,7 @@ public void Attach(ILogWriter newLogWriter)
 
 			if (detachException != null)
 				this.ServerWriteLine(
-					string.Format("Log writer \"{0}\" had thrown an unexpected exception:\n{1}", prevLogWriter.Name, detachException), 
+					string.Format("Log writer \"{0}\" has thrown an unexpected exception:\n{1}", prevLogWriter?.Name, detachException), 
 					TraceLevel.Error);
 		}
 
@@ -72,7 +79,7 @@ internal void Deatch()
 			}
 			catch (Exception ex)
 			{
-				DefaultLogWriter.ServerWriteLine(
+				DefaultLogWriter?.ServerWriteLine(
 					string.Format("Log writer \"{0}\" has thrown an unexpected exception:\n{1}", this.LogWriterName, ex), TraceLevel.Error);
 			}
 
@@ -81,27 +88,33 @@ internal void Deatch()
 
 		internal void ServerWriteLine(string message, TraceLevel kind)
 		{
+			if (this.WrappedLogWriter == null)
+				return;
+
 			try
 			{
 				this.WrappedLogWriter.ServerWriteLine(message, kind);
 			}
 			catch (Exception ex)
 			{
-				this.DefaultLogWriter.ServerWriteLine(string.Format(
+				this.DefaultLogWriter?.ServerWriteLine(string.Format(
 					"The attached log writer \"{0}\" has thrown an unexpected exception:\n{1}", this.LogWriterName, ex),
 					TraceLevel.Error);
 			}
 		}
 
 		public void PluginWriteLine(TerrariaPlugin plugin, string message, TraceLevel kind)
 		{
+			if (this.WrappedLogWriter == null)
+				return;
+
 			try
 			{
 				this.WrappedLogWriter.PluginWriteLine(plugin, message, kind);
 			}
 			catch (Exception ex)
 			{
-				DefaultLogWriter.ServerWriteLine(string.Format(
+				DefaultLogWriter?.ServerWriteLine(string.Format(
 					"The attached log writer \"{0}\" has thrown an unexpected exception:\n{1}", this.LogWriterName, ex),
 					TraceLevel.Error);
 			}

TerrariaServerAPI/TerrariaApi.Server/ServerApi.cs

@@ -3,7 +3,6 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
-using System.Net;
 using System.Reflection;
 using System.Linq;
 using Terraria;
@@ -68,8 +67,9 @@ public static bool IsWorldRunning
 
 		static ServerApi()
 		{
+			Dictionary<string, string> args = Utils.ParseArguements(Environment.GetCommandLineArgs());
 			Hooks = new HookManager();
-			LogWriter = new LogWriterManager();
+			LogWriter = new LogWriterManager(enabled: !args.ContainsKey("-nolog"));
 			Profiler = new ProfilerManager();
 
 			UseAsyncSocketsInMono = false;
@@ -133,6 +133,8 @@ internal static void HandleCommandLine(string[] parms)
 
 			foreach (KeyValuePair<string, string> arg in args)
 			{
+				// Note that the flag -nolog also exists in the constructor, but it can't be here because
+				// the log writer initializes before this code is run
 				switch (arg.Key.ToLower())
 				{
 					case "-ignoreversion":
@@ -162,6 +164,7 @@ internal static void HandleCommandLine(string[] parms)
 							break;
 						}
 					case "-players":
+					case "-maxplayers":
 						{
 							int playerCount;
 							if (!Int32.TryParse(arg.Value, out playerCount))
@@ -175,16 +178,13 @@ internal static void HandleCommandLine(string[] parms)
 
 							break;
 						}
-					case "-maxplayers":
-						goto case "-players";
 					case "-pass":
+					case "-password":
 						{
 							Netplay.ServerPassword = arg.Value;
 
 							break;
 						}
-					case "-password":
-						goto case "-pass";
 					case "-worldname":
 						{
 							game.SetWorldName(arg.Value);