mirror of
https://github.com/Jackett/Jackett.git
synced 2025-09-17 17:34:09 +02:00
More console logging for non-windows
This commit is contained in:
@@ -57,6 +57,9 @@
|
|||||||
<Reference Include="CsQuery">
|
<Reference Include="CsQuery">
|
||||||
<HintPath>..\packages\CsQuery.1.3.4\lib\net40\CsQuery.dll</HintPath>
|
<HintPath>..\packages\CsQuery.1.3.4\lib\net40\CsQuery.dll</HintPath>
|
||||||
</Reference>
|
</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">
|
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
|
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||||
|
@@ -53,21 +53,24 @@ namespace Jackett
|
|||||||
logFile.FileName = Path.Combine(AppConfigDirectory, "log.txt");
|
logFile.FileName = Path.Combine(AppConfigDirectory, "log.txt");
|
||||||
logFile.Layout = "${longdate} ${level} ${message} \n ${exception:format=ToString}\n";
|
logFile.Layout = "${longdate} ${level} ${message} \n ${exception:format=ToString}\n";
|
||||||
var logFileRule = new LoggingRule("*", LogLevel.Debug, logFile);
|
var logFileRule = new LoggingRule("*", LogLevel.Debug, logFile);
|
||||||
|
logConfig.LoggingRules.Add(logFileRule);
|
||||||
|
|
||||||
var logAlert = new MessageBoxTarget();
|
if (Environment.OSVersion.Platform == PlatformID.Win32NT)
|
||||||
logConfig.AddTarget("alert", logAlert);
|
{
|
||||||
logAlert.Layout = "${message}";
|
var logAlert = new MessageBoxTarget();
|
||||||
logAlert.Caption = "Alert";
|
logConfig.AddTarget("alert", logAlert);
|
||||||
var logAlertRule = new LoggingRule("*", LogLevel.Fatal, logAlert);
|
logAlert.Layout = "${message}";
|
||||||
|
logAlert.Caption = "Alert";
|
||||||
|
var logAlertRule = new LoggingRule("*", LogLevel.Fatal, logAlert);
|
||||||
|
logConfig.LoggingRules.Add(logAlertRule);
|
||||||
|
}
|
||||||
|
|
||||||
var logConsole = new ConsoleTarget();
|
var logConsole = new ConsoleTarget();
|
||||||
logConfig.AddTarget("console", logConsole);
|
logConfig.AddTarget("console", logConsole);
|
||||||
logConsole.Layout = "${longdate} ${level} ${message} ${exception:format=ToString}";
|
logConsole.Layout = "${longdate} ${level} ${message} ${exception:format=ToString}";
|
||||||
var logConsoleRule = new LoggingRule("*", LogLevel.Debug, logConsole);
|
var logConsoleRule = new LoggingRule("*", LogLevel.Debug, logConsole);
|
||||||
|
|
||||||
logConfig.LoggingRules.Add(logFileRule);
|
|
||||||
logConfig.LoggingRules.Add(logAlertRule);
|
|
||||||
logConfig.LoggingRules.Add(logConsoleRule);
|
logConfig.LoggingRules.Add(logConsoleRule);
|
||||||
|
|
||||||
LogManager.Configuration = logConfig;
|
LogManager.Configuration = logConfig;
|
||||||
LoggerInstance = LogManager.GetCurrentClassLogger();
|
LoggerInstance = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
@@ -79,15 +82,16 @@ namespace Jackett
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Application.EnableVisualStyles();
|
if (Environment.OSVersion.Platform == PlatformID.Win32NT)
|
||||||
Application.SetCompatibleTextRenderingDefault(false);
|
Application.Run(new Main());
|
||||||
Application.Run(new Main());
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Running in headless mode.");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Console.WriteLine("Running in headless mode.");
|
||||||
|
|
||||||
Task.WaitAll(serverTask);
|
Task.WaitAll(serverTask);
|
||||||
Console.WriteLine("Server thread exit");
|
Console.WriteLine("Server thread exit");
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="CsQuery" version="1.3.4" targetFramework="net451" />
|
<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="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
|
||||||
<package id="NLog" version="3.2.0.0" targetFramework="net451" />
|
<package id="NLog" version="3.2.0.0" targetFramework="net451" />
|
||||||
</packages>
|
</packages>
|
Reference in New Issue
Block a user