Try to avoid db errors with unicorn...

springernature · May 9, 2014 · 4244724 · 4244724
1 parent c5110b2
commit 4244724
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/config/unicorn.rb b/config/unicorn.rb
@@ -1,3 +1,7 @@
+$LOAD_PATH.unshift File.join(__FILE__, '../../lib')
+
+require 'bandiera'
+
 port            = Integer(ENV['PORT'] || 5000)
 no_of_processes = Integer(ENV['PROCESSES'] || 1)
 unix_socket     = ENV['SOCKET'] || '/tmp/bandiera.sock'
@@ -18,6 +22,14 @@
   logger(syslog_logger)
 end
 
+before_fork do |server, worker|
+  Bandiera::Db.disconnect!
+end
+
+after_fork do |server, worker|
+  Bandiera::Db.connection
+end
+
 if ENV['WORKING_DIR']
   working_directory ENV['WORKING_DIR']
 end

diff --git a/lib/bandiera/db.rb b/lib/bandiera/db.rb
@@ -13,6 +13,11 @@ def self.connection
       @connection ||= Sequel.connect(connection_string)
     end
 
+    def self.disconnect!
+      connection.disconnect
+      @connection = nil
+    end
+
     def self.params(env)
       {
         host:         configuration[env]['host'],
@@ -25,7 +30,8 @@ def self.params(env)
     end
 
     def self.connection_string
-      return ENV['DATABASE_URL'] if ENV.key? 'DATABASE_URL'
+      return ENV['DATABASE_URL'] if ENV['DATABASE_URL']
+
       conn = params(ENV['RACK_ENV'])
 
       if RUBY_PLATFORM == 'java'