From 9da83cbdc3f744c84256accce443cd9b7011d314 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 4 Nov 2019 07:43:15 -0500
Subject: [PATCH] remove alive job

---
 src/Admin/Jobs/JobsHostedService.cs | 16 ++++++++++++----
 src/Admin/Startup.cs                |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Admin/Jobs/JobsHostedService.cs b/src/Admin/Jobs/JobsHostedService.cs
index 05d89e7bc8..8ea30c83f7 100644
--- a/src/Admin/Jobs/JobsHostedService.cs
+++ b/src/Admin/Jobs/JobsHostedService.cs
@@ -52,20 +52,28 @@ namespace Bit.Admin.Jobs
                 .WithCronSchedule("0 0 0 ? * SUN", x => x.InTimeZone(timeZone))
                 .Build();
 
-            Jobs = new List<Tuple<Type, ITrigger>>
+            var jobs = new List<Tuple<Type, ITrigger>>
             {
-                new Tuple<Type, ITrigger>(typeof(AliveJob), everyTopOfTheHourTrigger),
                 new Tuple<Type, ITrigger>(typeof(DatabaseExpiredGrantsJob), everyFridayAt10pmTrigger),
                 new Tuple<Type, ITrigger>(typeof(DatabaseUpdateStatisticsJob), everySaturdayAtMidnightTrigger),
                 new Tuple<Type, ITrigger>(typeof(DatabaseRebuildlIndexesJob), everySundayAtMidnightTrigger)
             };
 
+            if(!_globalSettings.SelfHosted)
+            {
+                jobs.Add(new Tuple<Type, ITrigger>(typeof(AliveJob), everyTopOfTheHourTrigger));
+            }
+
+            Jobs = jobs;
             await base.StartAsync(cancellationToken);
         }
 
-        public static void AddJobsServices(IServiceCollection services)
+        public static void AddJobsServices(IServiceCollection services, bool selfHosted)
         {
-            services.AddTransient<AliveJob>();
+            if(!selfHosted)
+            {
+                services.AddTransient<AliveJob>();
+            }
             services.AddTransient<DatabaseUpdateStatisticsJob>();
             services.AddTransient<DatabaseRebuildlIndexesJob>();
             services.AddTransient<DatabaseExpiredGrantsJob>();
diff --git a/src/Admin/Startup.cs b/src/Admin/Startup.cs
index 6ce698fc48..919b7b8710 100644
--- a/src/Admin/Startup.cs
+++ b/src/Admin/Startup.cs
@@ -72,7 +72,7 @@ namespace Bit.Admin
             services.Configure<RouteOptions>(options => options.LowercaseUrls = true);
 
             // Jobs service
-            Jobs.JobsHostedService.AddJobsServices(services);
+            Jobs.JobsHostedService.AddJobsServices(services, globalSettings.SelfHosted);
             services.AddHostedService<Jobs.JobsHostedService>();
             if(globalSettings.SelfHosted)
             {