From d6b9cbc71eae9e4ed01745b95645375666fe1c0d Mon Sep 17 00:00:00 2001
From: Jamie <tidusjar@gmail.com>
Date: Wed, 24 Apr 2019 12:39:42 +0100
Subject: [PATCH] Develop (#2947)

* Start the scheduler after the jobs have been assigned

* More to debug logging

* logging
---
 src/Ombi.DependencyInjection/IocExtensions.cs  | 2 +-
 src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs | 3 +++
 src/Ombi.Schedule/OmbiQuartz.cs                | 5 ++++-
 src/Ombi.Schedule/OmbiScheduler.cs             | 5 ++---
 src/Ombi/appsettings.json                      | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Ombi.DependencyInjection/IocExtensions.cs b/src/Ombi.DependencyInjection/IocExtensions.cs
index 3289cd9b2..5c8c46739 100644
--- a/src/Ombi.DependencyInjection/IocExtensions.cs
+++ b/src/Ombi.DependencyInjection/IocExtensions.cs
@@ -192,7 +192,7 @@ namespace Ombi.DependencyInjection
 
         public static void RegisterJobs(this IServiceCollection services)
         {
-            services.AddTransient<IJobFactory, IoCJobFactory>(provider => new IoCJobFactory(provider));
+            services.AddSingleton<IJobFactory, IoCJobFactory>(provider => new IoCJobFactory(provider));
             services.AddTransient<IBackgroundJobClient, BackgroundJobClient>();
 
             services.AddTransient<IPlexContentSync, PlexContentSync>();
diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs b/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs
index 0c8eb30a6..14d781064 100644
--- a/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs
+++ b/src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs
@@ -131,8 +131,11 @@ namespace Ombi.Schedule.Jobs.Plex
                 await OmbiQuartz.TriggerJob(nameof(IPlexAvailabilityChecker), "Plex");
             }
 
+            Logger.LogInformation("Finished Plex Content Cacher, with processed content: {0}, episodes: {0}", processedContent.Content.Count(), processedContent.Episodes.Count());
+
             await Notification.Clients.Clients(NotificationHub.AdminConnectionIds)
                 .SendAsync(NotificationHub.NotificationEvent, recentlyAddedSearch ? "Plex Recently Added Sync Finished" : "Plex Content Sync Finished");
+
         }
 
         private async Task<ProcessedContent> StartTheCache(PlexSettings plexSettings, bool recentlyAddedSearch)
diff --git a/src/Ombi.Schedule/OmbiQuartz.cs b/src/Ombi.Schedule/OmbiQuartz.cs
index a4bd28312..715bb187b 100644
--- a/src/Ombi.Schedule/OmbiQuartz.cs
+++ b/src/Ombi.Schedule/OmbiQuartz.cs
@@ -60,7 +60,10 @@ namespace Ombi.Schedule
             {
                 ITrigger jobTrigger = TriggerBuilder.Create()
                     .WithIdentity(name + "Trigger", group)
-                    .WithCronSchedule(cronExpression)
+                    .WithCronSchedule(cronExpression, 
+                        x => x.WithMisfireHandlingInstructionFireAndProceed())
+                    .ForJob(name, group)
+                    .StartNow()
                     .Build();
                 await Scheduler.ScheduleJob(job, jobTrigger);
             } 
diff --git a/src/Ombi.Schedule/OmbiScheduler.cs b/src/Ombi.Schedule/OmbiScheduler.cs
index 1f7920abb..a1a7a3765 100644
--- a/src/Ombi.Schedule/OmbiScheduler.cs
+++ b/src/Ombi.Schedule/OmbiScheduler.cs
@@ -48,15 +48,14 @@ namespace Ombi.Schedule
             // Set job factory
             OmbiQuartz.Instance.UseJobFactory(jobFactory);
 
-            // Run Quartz
-            await OmbiQuartz.Start();
-
             // Run configuration
             await AddPlex(s);
             await AddEmby(s);
             await AddDvrApps(s);
             await AddSystem(s);
 
+            // Run Quartz
+            await OmbiQuartz.Start();
         }
 
         private static async Task AddSystem(JobSettings s)
diff --git a/src/Ombi/appsettings.json b/src/Ombi/appsettings.json
index 8a9e38008..7d352f0dc 100644
--- a/src/Ombi/appsettings.json
+++ b/src/Ombi/appsettings.json
@@ -2,7 +2,7 @@
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
-      "Default": "Information",
+      "Default": "Debug",
       "System": "Information",
       "Microsoft": "None",
       "Hangfire": "None"