zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

remove old redis proxy domain records on site delete

Browse source
This commit is contained in:
Kyle Drake 2017-12-27 12:41:22 -08:00
parent 3aea4e8333
commit e89f5d7092
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
models/site.rb
View file

@ -445,6 +445,8 @@ class Site < Sequel::Model
def before_destroy def before_destroy
DB.transaction { DB.transaction {
self.domain = nil
self.save_changes validate: false
owner.end_supporter_membership! if parent? owner.end_supporter_membership! if parent?
FileUtils.mkdir_p File.join(DELETED_SITES_ROOT, self.class.sharding_dir(username)) FileUtils.mkdir_p File.join(DELETED_SITES_ROOT, self.class.sharding_dir(username))
@ -460,6 +462,10 @@ class Site < Sequel::Model
} }
end end
def after_destroy
update_redis_proxy_record
end
def undelete! def undelete!
return false unless Dir.exist? deleted_files_path return false unless Dir.exist? deleted_files_path
FileUtils.mkdir_p File.join(SITE_FILES_ROOT, self.class.sharding_dir(username)) FileUtils.mkdir_p File.join(SITE_FILES_ROOT, self.class.sharding_dir(username))
@ -921,15 +927,17 @@ class Site < Sequel::Model
unless user_record.empty? unless user_record.empty?
user_record[:domain] = values[:domain] user_record[:domain] = values[:domain]
$redis_proxy.mapped_hmset "u-#{username}", user_record $redis_proxy.mapped_hmset "u-#{username}", user_record
$redis_proxy.del "u-#{@old_username}" if @old_username
end end
unless domain_record.empty? unless domain_record.empty?
$redis_proxy.mapped_hmset "d-#{values[:domain]}", domain_record $redis_proxy.mapped_hmset "d-#{values[:domain]}", domain_record
$redis_proxy.mapped_hmset "d-www.#{values[:domain]}", domain_record $redis_proxy.mapped_hmset "d-www.#{values[:domain]}", domain_record
end
$redis_proxy.del "u-#{@old_username}" if @old_username
$redis_proxy.del "d-#{@old_domain}" if @old_domain $redis_proxy.del "d-#{@old_domain}" if @old_domain
$redis_proxy.del "d-www.#{@old_domain}" if @old_domain $redis_proxy.del "d-www.#{@old_domain}" if @old_domain
end $redis_proxy.del "u-#{username}" if is_deleted
true true
end end