Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: properly reconnect to the current db after forking

This commit is contained in:
Régis Hanol 2014-04-07 19:38:47 +02:00
parent 7e7ca43a19
commit bb0baa6d7c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/discourse.rb
View File

@ -238,11 +238,12 @@ module Discourse
# after fork, otherwise Discourse will be # after fork, otherwise Discourse will be
# in a bad state # in a bad state
def self.after_fork def self.after_fork
current_db = RailsMultisite::ConnectionManagement.current_db
RailsMultisite::ConnectionManagement.establish_connection(db: current_db)
MessageBus.after_fork
SiteSetting.after_fork SiteSetting.after_fork
ActiveRecord::Base.establish_connection
$redis.client.reconnect $redis.client.reconnect
Rails.cache.reconnect Rails.cache.reconnect
MessageBus.after_fork
# /!\ HACK /!\ force sidekiq to create a new connection to redis # /!\ HACK /!\ force sidekiq to create a new connection to redis
Sidekiq.instance_variable_set(:@redis, nil) Sidekiq.instance_variable_set(:@redis, nil)
end end

1
lib/export/exporter.rb
View File

@ -144,6 +144,7 @@ module Export
pg_dump_running = true pg_dump_running = true
Thread.new do Thread.new do
RailsMultisite::ConnectionManagement::establish_connection(db: @current_db)
while pg_dump_running while pg_dump_running
message = logs.pop.strip message = logs.pop.strip
log(message) unless message.blank? log(message) unless message.blank?