Merge branch 'sidekiq_worker_fix' into 'master'

Added Sidekiq config...

I added a config file for Sidekiq for regulating the amount of threads.

See merge request !70

3 files changed, 7 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 55e938f..cc933f2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,9 @@ v7.11.0
 v7.10.1
   - Fix failing migration when update to 7.10 from 7.8 and older versions
 
+sidekiq_wirker_fix
+	- added sidekiq.yml
+	- integrated in script/background_jobs
 v7.10.0
   - Projects sorting by last commit date
   - Add project search at runner page
diff --git a/config/sidekiq.yml.example b/config/sidekiq.yml.example
new file mode 100644
index 0000000..c691db6
--- /dev/null
+++ b/config/sidekiq.yml.example
@@ -0,0 +1,2 @@
+--
+:concurrency: 5
\ No newline at end of file
diff --git a/script/background_jobs b/script/background_jobs
index 4c88809..49d0b49 100755
--- a/script/background_jobs
+++ b/script/background_jobs
@@ -4,6 +4,7 @@ cd $(dirname $0)/..
 app_root=$(pwd)
 sidekiq_pidfile="$app_root/tmp/pids/sidekiq.pid"
 sidekiq_logfile="$app_root/log/sidekiq.log"
+sidekiq_config="$app_root/config/sidekiq.yml"
 gitlab_ci_user=$(ls -l config.ru | awk '{print $3}')
 
 function stop
@@ -27,7 +28,7 @@ function restart
 
 function start_sidekiq
 {
-  bundle exec sidekiq -q runner,common,default -e $RAILS_ENV -P $sidekiq_pidfile -d -L $sidekiq_logfile >> $sidekiq_logfile 2>&1
+  bundle exec sidekiq -q runner,common,default -e $RAILS_ENV -P $sidekiq_pidfile -d -L $sidekiq_logfile -C $sidekiq_config >> $sidekiq_logfile 2>&1
 }
 
 case "$1" in