From e63b697d4d7a6674e961bfa8d6d61bf8c13920b2 Mon Sep 17 00:00:00 2001 From: "Jamie.Rees" Date: Thu, 21 Sep 2017 08:33:13 +0100 Subject: [PATCH] More logging --- CHANGELOG.md | 84 +++++++++++++++++-- .../Jobs/Ombi/OmbiAutomaticUpdater.cs | 21 +++-- src/Ombi/Startup.cs | 31 +++---- 3 files changed, 100 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 845a9be0f..5fa48ffd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,90 @@ ### **New Features** +- Update versioning. [Jamie.Rees] + +- Update nuget packages and added logging to the Updater #865. [tidusjar] + +- Added the ForwardedHeaders middlewear for Reverse Proxy scenarios #865. [tidusjar] + +- Update build.cake. [Jamie] + +- Update DiscordApi.cs. [Jamie] + +- Update README.md. [PotatoQuality] + +- Added a authorization filter so we can see hangfire outisde of the local requests. [TidusJar] + +- Added more logging for the updater. [Jamie.Rees] + - Added the emby episode cacher and the job to check if items are available on emby #1464 #865. [tidusjar] - Added the Emby Cacher, we now cache the Emby data! [tidusjar] - Updated CHangelog. [Jamie.Rees] +### **Fixes** + +- Set debug level to Debug for now. [Jamie.Rees] + +- Add linting and indexes for interfaces/services (#1510) [Matt Jeanes] + +- Fixed the issue with the tv search not working #1463. [Jamie.Rees] + +- Latest practices... also probably broke some styles - sorry (#1508) [Matt Jeanes] + +- Build with the branch version. [tidusjar] + +- Build fix. [tidusjar] + +- Fixed build. [tidusjar] + +- Omgwtf so many changes. #865. [tidusjar] + +- Tests. [Jamie.Rees] + +- #1456 Started on the User Importer Also added the remember me button. [Jamie.Rees] + +- Made some UI changes, reworked the Emby and Plex screens to make them more user friendly and no so fugly. #865 Also made the login page placeholder text slightly lighter. [Jamie.Rees] + +- Cake skip verification build stuff #865. [Jamie.Rees] + +- Some fixes around the UI and managing requests #865. [tidusjar] + +- #1486. [Jamie.Rees] + +- #1486. [Jamie.Rees] + +- Upgraded to .net core 2.0 #1486. [Jamie.Rees] + +- #865 Finished the landing page, we now check the server's status. [Jamie.Rees] + +- Fixed build. [TidusJar] + +- Removed the telegram api. [Jamie.Rees] + +- Small changes on the updater #1460 #865. [Jamie.Rees] + +- Remove unused functions. [Dhruv Bhavsar] + +- Make Episode picker similar to Requests Child view. #1457 #1463. [Dhruv Bhavsar] + +- Fix merge conflict for TvRequests component. [Dhruv Bhavsar] + +- Upstream Changes... [Dhruv Bhavsar] + +- Clean up Requests page code by moving children request to old component, remove additional REST calls when merging and update component names to make more sense. [Dhruv Bhavsar] + +- Lots of different UI enhancements and fixes #865. [tidusjar] + +- Gitchangelog. [tidusjar] + +- Fixed the issue where we were using the wrong availability options. [tidusjar] + +- Fixed a bunch of bugs in Ombi #865. [tidusjar] + +- Build versioning. [Jamie.Rees] + - Updated changelog. [Jamie.Rees] - Updated assembly versions. [Jamie.Rees] @@ -124,12 +202,6 @@ ### **Fixes** -- Fixed the issue where we were using the wrong availability options. [tidusjar] - -- Fixed a bunch of bugs in Ombi #865. [tidusjar] - -- Build versioning. [Jamie.Rees] - - #1460 The assembly versioning seems to work correctly now. [Jamie.Rees] - More build versioning changes #865. [tidusjar] diff --git a/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs b/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs index 00824e631..eb4ae5864 100644 --- a/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs +++ b/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs @@ -42,20 +42,21 @@ namespace Ombi.Schedule.Jobs.Ombi Logger.LogInformation(LoggingEvents.Updater, "Product Version {0}", productVersion); c.WriteLine("Product Version {0}", productVersion); - var productArray = productVersion.Split('-'); - var version = productArray[0]; - var branch = productArray[1]; - - - Logger.LogInformation(LoggingEvents.Updater, "Version {0}", version); - Logger.LogInformation(LoggingEvents.Updater, "Branch {0}", branch); - try { + var productArray = productVersion.Split('-'); + var version = productArray[0]; + c.WriteLine("Version {0}", version); + var branch = productArray[1]; + c.WriteLine("Branch Version {0}", branch); + + Logger.LogInformation(LoggingEvents.Updater, "Version {0}", version); + Logger.LogInformation(LoggingEvents.Updater, "Branch {0}", branch); + + c.WriteLine("Looking for updates now"); var updates = await OmbiService.GetUpdates(branch); var serverVersion = updates.UpdateVersionString; - Logger.LogInformation(LoggingEvents.Updater, "Service Version {0}", updates.UpdateVersionString); c.WriteLine("Service Version {0}", updates.UpdateVersionString); @@ -76,7 +77,6 @@ namespace Ombi.Schedule.Jobs.Ombi { Logger.LogInformation(LoggingEvents.Updater, "We are OSX"); download = updates.Downloads.FirstOrDefault(x => x.Name.Contains("osx", CompareOptions.IgnoreCase)); - } else { @@ -164,7 +164,6 @@ namespace Ombi.Schedule.Jobs.Ombi { proc.Start(); } - } } catch (Exception e) diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs index 09b5f382b..970d56a9f 100644 --- a/src/Ombi/Startup.cs +++ b/src/Ombi/Startup.cs @@ -57,22 +57,22 @@ namespace Ombi .AddEnvironmentVariables(); Configuration = builder.Build(); - if (env.IsDevelopment()) - { - Log.Logger = new LoggerConfiguration() - .MinimumLevel.Debug() - .WriteTo.RollingFile(Path.Combine(env.ContentRootPath, "Logs", "log-{Date}.txt")) - .WriteTo.SQLite("Ombi.db", "Logs", LogEventLevel.Debug) - .CreateLogger(); - } - if (env.IsProduction()) - { + //if (env.IsDevelopment()) + //{ Log.Logger = new LoggerConfiguration() .MinimumLevel.Debug() .WriteTo.RollingFile(Path.Combine(env.ContentRootPath, "Logs", "log-{Date}.txt")) .WriteTo.SQLite("Ombi.db", "Logs", LogEventLevel.Debug) .CreateLogger(); - } + //} + //if (env.IsProduction()) + //{ + // Log.Logger = new LoggerConfiguration() + // .MinimumLevel.Debug() + // .WriteTo.RollingFile(Path.Combine(env.ContentRootPath, "Logs", "log-{Date}.txt")) + // .WriteTo.SQLite("Ombi.db", "Logs", LogEventLevel.Debug) + // .CreateLogger(); + //} } public IConfigurationRoot Configuration { get; } @@ -102,7 +102,6 @@ namespace Ombi var tokenValidationParameters = new TokenValidationParameters { - ValidateIssuerSigningKey = true, IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(tokenOptions.GetValue("SecretKey", string.Empty))), @@ -188,9 +187,6 @@ namespace Ombi x.UseConsole(); }); - - - // Build the intermediate service provider var serviceProvider = services.BuildServiceProvider(); @@ -238,16 +234,13 @@ namespace Ombi jobSetup.Setup(); ctx.Seed(); - var provider = new FileExtensionContentTypeProvider(); - provider.Mappings[".map"] = "application/octet-stream"; + var provider = new FileExtensionContentTypeProvider {Mappings = {[".map"] = "application/octet-stream"}}; app.UseStaticFiles(new StaticFileOptions() { ContentTypeProvider = provider }); - - app.UseAuthentication(); //ApiKeyMiddlewear(app, serviceProvider);