From 67a079a17c6c8b035a7331de4a12369986b21905 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 3 Jun 2016 22:52:32 +0100 Subject: [PATCH] updated nlog and fixed #295 --- PlexRequests.Api/PlexRequests.Api.csproj | 7 ++++--- PlexRequests.Api/packages.config | 2 +- PlexRequests.Core/PlexRequests.Core.csproj | 7 ++++--- PlexRequests.Core/packages.config | 2 +- PlexRequests.Helpers.Tests/app.config | 12 ++++++------ PlexRequests.Helpers/LoggingHelper.cs | 1 - PlexRequests.Helpers/PlexRequests.Helpers.csproj | 7 ++++--- PlexRequests.Helpers/packages.config | 2 +- PlexRequests.Services/PlexRequests.Services.csproj | 7 ++++--- PlexRequests.Services/packages.config | 2 +- PlexRequests.Store/PlexRequests.Store.csproj | 7 ++++--- PlexRequests.Store/packages.config | 2 +- PlexRequests.UI/Modules/AdminModule.cs | 2 ++ PlexRequests.UI/PlexRequests.UI.csproj | 7 ++++--- PlexRequests.UI/packages.config | 2 +- 15 files changed, 38 insertions(+), 31 deletions(-) diff --git a/PlexRequests.Api/PlexRequests.Api.csproj b/PlexRequests.Api/PlexRequests.Api.csproj index d627e0ac9..9e24aebdd 100644 --- a/PlexRequests.Api/PlexRequests.Api.csproj +++ b/PlexRequests.Api/PlexRequests.Api.csproj @@ -31,6 +31,10 @@ 4 + + ..\packages\NLog.4.3.4\lib\net45\NLog.dll + True + ..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll True @@ -52,9 +56,6 @@ ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\NLog.4.2.3\lib\net45\NLog.dll - ..\packages\TMDbLib.0.9.0.0-alpha\lib\net45\TMDbLib.dll diff --git a/PlexRequests.Api/packages.config b/PlexRequests.Api/packages.config index dd0b7d8d3..e7e63c904 100644 --- a/PlexRequests.Api/packages.config +++ b/PlexRequests.Api/packages.config @@ -3,7 +3,7 @@ - + diff --git a/PlexRequests.Core/PlexRequests.Core.csproj b/PlexRequests.Core/PlexRequests.Core.csproj index 62a2af642..c460849fd 100644 --- a/PlexRequests.Core/PlexRequests.Core.csproj +++ b/PlexRequests.Core/PlexRequests.Core.csproj @@ -34,6 +34,10 @@ ..\Assemblies\Mono.Data.Sqlite.dll + + ..\packages\NLog.4.3.4\lib\net45\NLog.dll + True + @@ -54,9 +58,6 @@ ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\NLog.4.2.3\lib\net45\NLog.dll - ..\packages\Octokit.0.19.0\lib\net45\Octokit.dll diff --git a/PlexRequests.Core/packages.config b/PlexRequests.Core/packages.config index d378174d8..41cff5672 100644 --- a/PlexRequests.Core/packages.config +++ b/PlexRequests.Core/packages.config @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/PlexRequests.Helpers.Tests/app.config b/PlexRequests.Helpers.Tests/app.config index 1911601e2..f2cdc9810 100644 --- a/PlexRequests.Helpers.Tests/app.config +++ b/PlexRequests.Helpers.Tests/app.config @@ -1,15 +1,15 @@ - + - - + + - - + + - + diff --git a/PlexRequests.Helpers/LoggingHelper.cs b/PlexRequests.Helpers/LoggingHelper.cs index ce9497a8b..73562eebe 100644 --- a/PlexRequests.Helpers/LoggingHelper.cs +++ b/PlexRequests.Helpers/LoggingHelper.cs @@ -139,7 +139,6 @@ namespace PlexRequests.Helpers if (level == LogLevel.Info) { rule.EnableLoggingForLevel(LogLevel.Info); - rule.EnableLoggingForLevel(LogLevel.Debug); rule.EnableLoggingForLevel(LogLevel.Warn); rule.EnableLoggingForLevel(LogLevel.Error); rule.EnableLoggingForLevel(LogLevel.Fatal); diff --git a/PlexRequests.Helpers/PlexRequests.Helpers.csproj b/PlexRequests.Helpers/PlexRequests.Helpers.csproj index 538d65080..47ebb77b4 100644 --- a/PlexRequests.Helpers/PlexRequests.Helpers.csproj +++ b/PlexRequests.Helpers/PlexRequests.Helpers.csproj @@ -31,6 +31,10 @@ 4 + + ..\packages\NLog.4.3.4\lib\net45\NLog.dll + True + @@ -43,9 +47,6 @@ ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\NLog.4.2.3\lib\net45\NLog.dll - diff --git a/PlexRequests.Helpers/packages.config b/PlexRequests.Helpers/packages.config index e9ff15713..150691482 100644 --- a/PlexRequests.Helpers/packages.config +++ b/PlexRequests.Helpers/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/PlexRequests.Services/PlexRequests.Services.csproj b/PlexRequests.Services/PlexRequests.Services.csproj index caafe8d77..fc61aab55 100644 --- a/PlexRequests.Services/PlexRequests.Services.csproj +++ b/PlexRequests.Services/PlexRequests.Services.csproj @@ -32,6 +32,10 @@ + + ..\packages\NLog.4.3.4\lib\net45\NLog.dll + True + @@ -61,9 +65,6 @@ ..\Assemblies\Mono.Data.Sqlite.dll - - ..\packages\NLog.4.2.3\lib\net45\NLog.dll - ..\packages\Quartz.2.3.3\lib\net40\Quartz.dll diff --git a/PlexRequests.Services/packages.config b/PlexRequests.Services/packages.config index bed7e714f..3276cd22e 100644 --- a/PlexRequests.Services/packages.config +++ b/PlexRequests.Services/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/PlexRequests.Store/PlexRequests.Store.csproj b/PlexRequests.Store/PlexRequests.Store.csproj index 6742f3e1c..e0d242c88 100644 --- a/PlexRequests.Store/PlexRequests.Store.csproj +++ b/PlexRequests.Store/PlexRequests.Store.csproj @@ -42,6 +42,10 @@ ..\Assemblies\Mono.Data.Sqlite.dll + + ..\packages\NLog.4.3.4\lib\net45\NLog.dll + True + @@ -55,9 +59,6 @@ ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\NLog.4.2.3\lib\net45\NLog.dll - diff --git a/PlexRequests.Store/packages.config b/PlexRequests.Store/packages.config index 457f93723..da6daaa12 100644 --- a/PlexRequests.Store/packages.config +++ b/PlexRequests.Store/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs index bdf0248a6..1c04f587a 100644 --- a/PlexRequests.UI/Modules/AdminModule.cs +++ b/PlexRequests.UI/Modules/AdminModule.cs @@ -688,6 +688,8 @@ namespace PlexRequests.UI.Modules private Response GetLogLevels() { var levels = LogManager.Configuration.LoggingRules.FirstOrDefault(x => x.NameMatches("database")); + Log.Debug("debug"); + Log.Info("Info"); return Response.AsJson(levels.Levels); } diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj index 708e7f098..5b2cdaa8b 100644 --- a/PlexRequests.UI/PlexRequests.UI.csproj +++ b/PlexRequests.UI/PlexRequests.UI.csproj @@ -65,6 +65,10 @@ ..\packages\Nancy.Swagger.0.1.0-alpha3\lib\net40\Nancy.Swagger.dll True + + ..\packages\NLog.4.3.4\lib\net45\NLog.dll + True + ..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll True @@ -139,9 +143,6 @@ ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\NLog.4.2.3\lib\net45\NLog.dll - ..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/PlexRequests.UI/packages.config b/PlexRequests.UI/packages.config index ddcf218f0..e9e79ee88 100644 --- a/PlexRequests.UI/packages.config +++ b/PlexRequests.UI/packages.config @@ -23,7 +23,7 @@ - +