From 012cec3a8b54a620ef39b66a091605bcd79610c0 Mon Sep 17 00:00:00 2001 From: zone117x <zone117x@gmail.com> Date: Wed, 22 Apr 2015 18:37:25 -0600 Subject: [PATCH] More console logging for non-windows --- src/Jackett/Jackett.csproj | 3 +++ src/Jackett/Program.cs | 28 ++++++++++++++++------------ src/Jackett/packages.config | 1 + 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj index 710fe375..c6d358b0 100644 --- a/src/Jackett/Jackett.csproj +++ b/src/Jackett/Jackett.csproj @@ -57,6 +57,9 @@ <Reference Include="CsQuery"> <HintPath>..\packages\CsQuery.1.3.4\lib\net40\CsQuery.dll</HintPath> </Reference> + <Reference Include="ModernHttpClient"> + <HintPath>..\packages\modernhttpclient.2.3.0\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll</HintPath> + </Reference> <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> diff --git a/src/Jackett/Program.cs b/src/Jackett/Program.cs index f70ccdb8..0008b324 100644 --- a/src/Jackett/Program.cs +++ b/src/Jackett/Program.cs @@ -53,21 +53,24 @@ namespace Jackett logFile.FileName = Path.Combine(AppConfigDirectory, "log.txt"); logFile.Layout = "${longdate} ${level} ${message} \n ${exception:format=ToString}\n"; var logFileRule = new LoggingRule("*", LogLevel.Debug, logFile); + logConfig.LoggingRules.Add(logFileRule); - var logAlert = new MessageBoxTarget(); - logConfig.AddTarget("alert", logAlert); - logAlert.Layout = "${message}"; - logAlert.Caption = "Alert"; - var logAlertRule = new LoggingRule("*", LogLevel.Fatal, logAlert); + if (Environment.OSVersion.Platform == PlatformID.Win32NT) + { + var logAlert = new MessageBoxTarget(); + logConfig.AddTarget("alert", logAlert); + logAlert.Layout = "${message}"; + logAlert.Caption = "Alert"; + var logAlertRule = new LoggingRule("*", LogLevel.Fatal, logAlert); + logConfig.LoggingRules.Add(logAlertRule); + } var logConsole = new ConsoleTarget(); logConfig.AddTarget("console", logConsole); logConsole.Layout = "${longdate} ${level} ${message} ${exception:format=ToString}"; var logConsoleRule = new LoggingRule("*", LogLevel.Debug, logConsole); - - logConfig.LoggingRules.Add(logFileRule); - logConfig.LoggingRules.Add(logAlertRule); logConfig.LoggingRules.Add(logConsoleRule); + LogManager.Configuration = logConfig; LoggerInstance = LogManager.GetCurrentClassLogger(); @@ -79,15 +82,16 @@ namespace Jackett try { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Main()); + if (Environment.OSVersion.Platform == PlatformID.Win32NT) + Application.Run(new Main()); } catch (Exception ex) { - Console.WriteLine("Running in headless mode."); + } + Console.WriteLine("Running in headless mode."); + Task.WaitAll(serverTask); Console.WriteLine("Server thread exit"); } diff --git a/src/Jackett/packages.config b/src/Jackett/packages.config index c3b44dfe..f5186f51 100644 --- a/src/Jackett/packages.config +++ b/src/Jackett/packages.config @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="CsQuery" version="1.3.4" targetFramework="net451" /> + <package id="modernhttpclient" version="2.3.0" targetFramework="net451" /> <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" /> <package id="NLog" version="3.2.0.0" targetFramework="net451" /> </packages> \ No newline at end of file -- GitLab