From 42b06eef85ca0128487d0c6431be11c97d86b3fd Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 24 Apr 2014 09:51:55 +1000
Subject: [PATCH] Use new forking trick as opposed to seperate sidekiq process
 (saves 7% memory)

---
 templates/web.template.yml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/templates/web.template.yml b/templates/web.template.yml
index 0268582..0e7c930 100644
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -2,6 +2,7 @@ env:
   # You can have redis on a different box
   RAILS_ENV: 'production'
   UNICORN_WORKERS: 3
+  UNICORN_SIDEKIQS: 1
   # slightly less aggressive than "recommendation" but works fine with oobgc
   RUBY_GC_MALLOC_LIMIT: 40000000
   # this ensures we have enough heap space to handle a big pile of small reqs
@@ -49,18 +50,6 @@ run:
         cd $home
         exec sudo -E -u discourse LD_PRELOAD=/usr/lib/libjemalloc.so.1 bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb
 
-  - file:
-     path: /etc/service/sidekiq/run
-     chmod: "+x"
-     contents: |
-        #!/bin/bash
-        exec 2>&1
-        # redis
-        # postgres
-        sv start copy_env || exit 1
-        cd $home
-        exec sudo -E -u discourse LD_PRELOAD=/usr/lib/libjemalloc.so.1 bundle exec sidekiq
-
   - file:
      path: /etc/service/nginx/run
      chmod: "+x"
-- 
2.25.1