diff --git a/Novetus/Novetus.ClientScriptTester/ClientScriptTester.cs b/Novetus/Novetus.ClientScriptTester/ClientScriptTester.cs index 6591f6a..7197325 100644 --- a/Novetus/Novetus.ClientScriptTester/ClientScriptTester.cs +++ b/Novetus/Novetus.ClientScriptTester/ClientScriptTester.cs @@ -1,5 +1,8 @@ #region Usings +using NLog; using System; +using System.IO; +using System.Reflection; using System.Windows.Forms; #endregion @@ -14,6 +17,18 @@ namespace Novetus.ClientScriptTester [STAThread] static void Main(string[] args) { + var config = new NLog.Config.LoggingConfiguration(); + var logfile = new NLog.Targets.FileTarget("logfile") { FileName = Assembly.GetExecutingAssembly().Location + "\\Tester-log-" + DateTime.Today.ToString("MM-dd-yyyy") + ".log" }; + config.AddRule(LogLevel.Info, LogLevel.Fatal, logfile); + LogManager.Configuration = config; + + //https://stackify.com/csharp-catch-all-exceptions/ + AppDomain.CurrentDomain.FirstChanceException += (sender, eventArgs) => + { + Logger log = LogManager.GetCurrentClassLogger(); + log.Error(eventArgs.Exception); + }; + Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); diff --git a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj index e524512..af20bb2 100644 --- a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj +++ b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj @@ -34,9 +34,16 @@ NovetusIcon.ico + + ..\packages\NLog.4.7.2\lib\net40-client\NLog.dll + + + + + @@ -69,6 +76,7 @@ Resources.resx + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Novetus/Novetus.ClientScriptTester/packages.config b/Novetus/Novetus.ClientScriptTester/packages.config new file mode 100644 index 0000000..9ae8f0f --- /dev/null +++ b/Novetus/Novetus.ClientScriptTester/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Novetus/NovetusCMD/Novetus.CMD.csproj b/Novetus/NovetusCMD/Novetus.CMD.csproj index c49d356..5a08fb9 100644 --- a/Novetus/NovetusCMD/Novetus.CMD.csproj +++ b/Novetus/NovetusCMD/Novetus.CMD.csproj @@ -91,7 +91,11 @@ ..\packages\Trove.Nini.1.1.0.0\lib\net20\Nini.dll + + ..\packages\NLog.4.7.2\lib\net40-client\NLog.dll + + 3.5 @@ -109,10 +113,13 @@ ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll True + + ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll True + diff --git a/Novetus/NovetusCMD/NovetusCMD.cs b/Novetus/NovetusCMD/NovetusCMD.cs index 05e7c3c..1c2c026 100644 --- a/Novetus/NovetusCMD/NovetusCMD.cs +++ b/Novetus/NovetusCMD/NovetusCMD.cs @@ -4,6 +4,7 @@ using Mono.Nat; using System.Diagnostics; using System.IO; using System.Windows.Forms; +using NLog; #endregion namespace NovetusCMD @@ -155,6 +156,18 @@ namespace NovetusCMD #region Main Program Function public static void Main(string[] args) { + var config = new NLog.Config.LoggingConfiguration(); + var logfile = new NLog.Targets.FileTarget("logfile") { FileName = GlobalPaths.ConfigDir + "\\CMD-log-" + DateTime.Today.ToString("MM-dd-yyyy") + ".log" }; + config.AddRule(LogLevel.Info, LogLevel.Fatal, logfile); + LogManager.Configuration = config; + + //https://stackify.com/csharp-catch-all-exceptions/ + AppDomain.CurrentDomain.FirstChanceException += (sender, eventArgs) => + { + Logger log = LogManager.GetCurrentClassLogger(); + log.Error(eventArgs.Exception); + }; + if (args.Length > 0) { CommandLineArguments.Arguments CommandLine = new CommandLineArguments.Arguments(args); diff --git a/Novetus/NovetusCMD/packages.config b/Novetus/NovetusCMD/packages.config index d635654..59fbcbc 100644 --- a/Novetus/NovetusCMD/packages.config +++ b/Novetus/NovetusCMD/packages.config @@ -4,5 +4,6 @@ + \ No newline at end of file diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs index 2206a2a..e89cad4 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs @@ -1,5 +1,6 @@ #region Usings using Nini.Config; +using NLog; using System; using System.Diagnostics; using System.Drawing; @@ -1177,26 +1178,34 @@ public class GlobalFuncs box.AppendText("[" + DateTime.Now.ToShortTimeString() + "] - ", Color.White); + Logger log = LogManager.GetCurrentClassLogger(); + switch (type) { case 2: box.AppendText(text, Color.Red); + log.Error(text); break; case 3: box.AppendText(text, Color.Lime); + log.Info(text); break; case 4: box.AppendText(text, Color.Aqua); + log.Info(text); break; case 5: box.AppendText(text, Color.Yellow); + log.Warn(text); break; case 6: box.AppendText(text, Color.LightSalmon); + log.Info(text); break; case 1: default: box.AppendText(text, Color.White); + log.Info(text); break; } @@ -1210,23 +1219,30 @@ public class GlobalFuncs ConsoleText("[" + DateTime.Now.ToShortTimeString() + "] - ", ConsoleColor.White); } + Logger log = LogManager.GetCurrentClassLogger(); + switch (type) { case 2: ConsoleText(text, ConsoleColor.Red); + log.Error(text); break; case 3: ConsoleText(text, ConsoleColor.Green); + log.Info(text); break; case 4: ConsoleText(text, ConsoleColor.Cyan); + log.Info(text); break; case 5: ConsoleText(text, ConsoleColor.Yellow); + log.Warn(text); break; case 1: default: ConsoleText(text, ConsoleColor.White); + log.Info(text); break; } diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj index 41de9bd..51ed96d 100644 --- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj +++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj @@ -76,6 +76,7 @@ ..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll True @@ -94,7 +95,11 @@ ..\packages\Trove.Nini.1.1.0.0\lib\net20\Nini.dll + + ..\packages\NLog.4.7.2\lib\net40-client\NLog.dll + + 3.5 @@ -112,10 +117,13 @@ ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll True + + ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll True + diff --git a/Novetus/NovetusLauncher/NovetusLauncher.cs b/Novetus/NovetusLauncher/NovetusLauncher.cs index 5c4c51d..96f55a3 100644 --- a/Novetus/NovetusLauncher/NovetusLauncher.cs +++ b/Novetus/NovetusLauncher/NovetusLauncher.cs @@ -1,5 +1,7 @@ #region Usings +using NLog; using System; +using System.IO; using System.Windows.Forms; #endregion @@ -14,6 +16,18 @@ namespace NovetusLauncher [STAThread] private static void Main(string[] args) { + var config = new NLog.Config.LoggingConfiguration(); + var logfile = new NLog.Targets.FileTarget("logfile") { FileName = GlobalPaths.ConfigDir + "\\Launcher-log-" + DateTime.Today.ToString("MM-dd-yyyy") + ".log" }; + config.AddRule(LogLevel.Info, LogLevel.Fatal, logfile); + LogManager.Configuration = config; + + //https://stackify.com/csharp-catch-all-exceptions/ + AppDomain.CurrentDomain.FirstChanceException += (sender, eventArgs) => + { + Logger log = LogManager.GetCurrentClassLogger(); + log.Error(eventArgs.Exception); + }; + Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); diff --git a/Novetus/NovetusLauncher/packages.config b/Novetus/NovetusLauncher/packages.config index b7926cb..fe11364 100644 --- a/Novetus/NovetusLauncher/packages.config +++ b/Novetus/NovetusLauncher/packages.config @@ -5,5 +5,6 @@ + \ No newline at end of file diff --git a/Novetus/NovetusURI/Novetus.URI.csproj b/Novetus/NovetusURI/Novetus.URI.csproj index 6affbfb..69b08ed 100644 --- a/Novetus/NovetusURI/Novetus.URI.csproj +++ b/Novetus/NovetusURI/Novetus.URI.csproj @@ -59,7 +59,11 @@ ..\packages\Trove.Nini.1.1.0.0\lib\net20\Nini.dll + + ..\packages\NLog.4.7.2\lib\net40-client\NLog.dll + + ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll @@ -70,10 +74,13 @@ ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll True + + ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll True + diff --git a/Novetus/NovetusURI/NovetusURI.cs b/Novetus/NovetusURI/NovetusURI.cs index 8d0ab7f..f7920de 100644 --- a/Novetus/NovetusURI/NovetusURI.cs +++ b/Novetus/NovetusURI/NovetusURI.cs @@ -1,5 +1,7 @@ #region Usings +using NLog; using System; +using System.IO; using System.Windows.Forms; #endregion @@ -14,6 +16,18 @@ namespace NovetusURI [STAThread] private static void Main(string[] args) { + var config = new NLog.Config.LoggingConfiguration(); + var logfile = new NLog.Targets.FileTarget("logfile") { FileName = GlobalPaths.ConfigDir + "\\URI-log-" + DateTime.Today.ToString("MM-dd-yyyy") + ".log" }; + config.AddRule(LogLevel.Info, LogLevel.Fatal, logfile); + LogManager.Configuration = config; + + //https://stackify.com/csharp-catch-all-exceptions/ + AppDomain.CurrentDomain.FirstChanceException += (sender, eventArgs) => + { + Logger log = LogManager.GetCurrentClassLogger(); + log.Error(eventArgs.Exception); + }; + Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); GlobalFuncs.Config(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigName, false); diff --git a/Novetus/NovetusURI/packages.config b/Novetus/NovetusURI/packages.config index d635654..59fbcbc 100644 --- a/Novetus/NovetusURI/packages.config +++ b/Novetus/NovetusURI/packages.config @@ -4,5 +4,6 @@ + \ No newline at end of file diff --git a/batch/dev_menu.bat b/batch/dev_menu.bat index 147fea0..190731b 100644 --- a/batch/dev_menu.bat +++ b/batch/dev_menu.bat @@ -50,6 +50,7 @@ IF %M%==4 GOTO MENU :CLEANJUNK del /S Novetus\*.pdb +del /S Novetus\*.log del /s /q Novetus\clients\2007M\content\scripts\CSMPBoot.lua del /s /q Novetus\clients\2007M-Shaders\content\scripts\CSMPBoot.lua