Only use CRON if running all jobs

exceptionless · Nov 30, 2023 · b26daf4 · b26daf4
1 parent 65fdda9
commit b26daf4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/Exceptionless.Job/JobRunnerOptions.cs b/src/Exceptionless.Job/JobRunnerOptions.cs
@@ -7,6 +7,8 @@ public JobRunnerOptions(string[] args)
         if (args.Length > 1)
             throw new ArgumentException("More than one job argument specified. You must either specify 1 named job or don't pass any arguments to run all jobs.");
 
+        AllJobs = args.Length == 0;
+
         CleanupData = args.Length == 0 || args.Contains(nameof(CleanupData), StringComparer.OrdinalIgnoreCase);
         if (CleanupData && args.Length != 0)
             JobName = nameof(CleanupData);
@@ -77,6 +79,7 @@ public JobRunnerOptions(string[] args)
     }
 
     public string JobName { get; } = "All";
+    public bool AllJobs { get; }
     public bool CleanupData { get; }
     public bool CleanupOrphanedData { get; }
     public bool CloseInactiveSessions { get; }

diff --git a/src/Exceptionless.Job/Program.cs b/src/Exceptionless.Job/Program.cs
@@ -135,18 +135,28 @@ private static void AddJobs(IServiceCollection services, JobRunnerOptions option
     {
         services.AddJobLifetimeService();
 
-        if (options.CleanupData)
+        if (options is { CleanupData: true, AllJobs: true })
             services.AddCronJob<CleanupDataJob>("30 */4 * * *");
-        if (options.CleanupOrphanedData)
+        if (options is { CleanupData: true, AllJobs: false })
+            services.AddJob<CleanupDataJob>();
+
+        if (options is { CleanupOrphanedData: true, AllJobs: true })
             services.AddCronJob<CleanupOrphanedDataJob>("45 */8 * * *");
+        if (options is { CleanupOrphanedData: true, AllJobs: false })
+            services.AddJob<CleanupOrphanedDataJob>();
+
         if (options.CloseInactiveSessions)
             services.AddJob<CloseInactiveSessionsJob>(true);
         if (options.DailySummary)
             services.AddJob<DailySummaryJob>(true);
         if (options.DataMigration)
             services.AddJob<DataMigrationJob>(true);
-        if (options.DownloadGeoIPDatabase)
+
+        if (options is { DownloadGeoIPDatabase: true, AllJobs: true })
             services.AddCronJob<DownloadGeoIPDatabaseJob>("0 1 * * *");
+        if (options is { DownloadGeoIPDatabase: true, AllJobs: false })
+            services.AddJob<DownloadGeoIPDatabaseJob>(true);
+
         if (options.EventNotifications)
             services.AddJob<EventNotificationsJob>(true);
         if (options.EventPosts)
@@ -157,8 +167,12 @@ private static void AddJobs(IServiceCollection services, JobRunnerOptions option
             services.AddJob<EventUserDescriptionsJob>(true);
         if (options.MailMessage)
             services.AddJob<MailMessageJob>(true);
-        if (options.MaintainIndexes)
+
+        if (options is { MaintainIndexes: true, AllJobs: true })
             services.AddCronJob<MaintainIndexesJob>("10 */2 * * *");
+        if (options is { MaintainIndexes: true, AllJobs: false })
+            services.AddJob<MaintainIndexesJob>();
+
         if (options.Migration)
             services.AddJob<MigrationJob>(true);
         if (options.StackStatus)