From c0bffe8df6efad374db3483d3e67f48359f88db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Tue, 10 Jan 2017 19:22:58 +0100
Subject: [PATCH] implement keep-alive requests for database connections

---
 app/workers/keep_alive_worker.rb                           | 7 +++++++
 ...885-implement-keep-alive-requests-for-db-connection.yml | 4 ++++
 config/initializers/1_settings.rb                          | 4 ++++
 3 files changed, 15 insertions(+)
 create mode 100644 app/workers/keep_alive_worker.rb
 create mode 100644 changelogs/unreleased/23885-implement-keep-alive-requests-for-db-connection.yml

diff --git a/app/workers/keep_alive_worker.rb b/app/workers/keep_alive_worker.rb
new file mode 100644
index 000000000000..5be6b963d278
--- /dev/null
+++ b/app/workers/keep_alive_worker.rb
@@ -0,0 +1,7 @@
+class KeepAliveWorker
+  include Sidekiq::Worker
+
+  def perform
+    ActiveRecord::Base.connection.execute('Select 1')
+  end
+end
diff --git a/changelogs/unreleased/23885-implement-keep-alive-requests-for-db-connection.yml b/changelogs/unreleased/23885-implement-keep-alive-requests-for-db-connection.yml
new file mode 100644
index 000000000000..8fd6bc0cccd8
--- /dev/null
+++ b/changelogs/unreleased/23885-implement-keep-alive-requests-for-db-connection.yml
@@ -0,0 +1,4 @@
+---
+title: Implements keep-alive requests for the database connection
+merge_request: 8562
+author: Hannes Rosenögger
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index ee97b4e42b95..ebb667837dd1 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -319,6 +319,10 @@ def host(url)
 Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['cron'] ||= '20 0 * * *'
 Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['job_class'] = 'RemoveUnreferencedLfsObjectsWorker'
 
+Settings.cron_jobs['keep_alive_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['keep_alive_worker']['cron'] ||= '*/10 * * * *'
+Settings.cron_jobs['keep_alive_worker']['job_class'] = 'KeepAliveWorker'
+
 #
 # GitLab Shell
 #
-- 
GitLab