github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 11:03:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

BUGFIX: make sure site settings are refreshed after a restore

Browse Source
This commit is contained in:
Régis Hanol 2014-04-08 18:06:53 +02:00
parent 6373de550f
commit 79c6bb718a
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/import/importer.rb
View File

@ -24,11 +24,6 @@ module Import
listen_for_shutdown_signal listen_for_shutdown_signal
enable_readonly_mode
pause_sidekiq
wait_for_sidekiq
ensure_directory_exists(@tmp_directory) ensure_directory_exists(@tmp_directory)
copy_archive_to_tmp_directory copy_archive_to_tmp_directory
@ -40,12 +35,22 @@ module Import
extract_dump extract_dump
restore_dump restore_dump
### READ-ONLY / START ###
enable_readonly_mode
pause_sidekiq
wait_for_sidekiq
switch_schema! switch_schema!
# TOFIX: MessageBus is busted... # TOFIX: MessageBus is busted...
migrate_database migrate_database
reconnect_database reconnect_database
reload_site_settings
disable_readonly_mode
### READ-ONLY / END ###
extract_uploads extract_uploads
rescue SystemExit rescue SystemExit
@ -183,6 +188,7 @@ module Import
has_error = false has_error = false
Thread.new do Thread.new do
RailsMultisite::ConnectionManagement::establish_connection(db: @current_db)
while psql_running while psql_running
message = logs.pop.strip message = logs.pop.strip
has_error ||= (message =~ /ERROR:/) has_error ||= (message =~ /ERROR:/)
@ -246,7 +252,12 @@ module Import
def reconnect_database def reconnect_database
log "Reconnecting to the database..." log "Reconnecting to the database..."
ActiveRecord::Base.establish_connection RailsMultisite::ConnectionManagement::establish_connection(db: @current_db)
end
def reload_site_settings
log "Reloading site settings..."
SiteSetting.refresh!
end end
def extract_uploads def extract_uploads
@ -286,7 +297,7 @@ module Import
log "Cleaning stuff up..." log "Cleaning stuff up..."
remove_tmp_directory remove_tmp_directory
unpause_sidekiq unpause_sidekiq
disable_readonly_mode disable_readonly_mode if Discourse.readonly_mode?
mark_import_as_not_running mark_import_as_not_running
log "Finished!" log "Finished!"
end end