zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-18 10:19:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '104525318-history_import' into staging

Browse source
This commit is contained in:
Vladimir Krylov 2016-01-19 10:01:14 +02:00
commit f3cfd694c6
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/legacy/domain_history.rb
View file

@ -103,7 +103,8 @@ module Legacy
where("object->>'hostname'='#{main_attrs[:hostname]}'"). where("object->>'hostname'='#{main_attrs[:hostname]}'").
reorder("created_at ASC").first reorder("created_at ASC").first
server[:id] = version.item_id.to_i server[:id] = version.item_id.to_i
::NameserverVersion.where(item_type: ::NameserverVersion, item_id: version.item_id).where(event: :create).first_or_create!( search_rel = ::NameserverVersion.where(item_type: ::NameserverVersion, item_id: version.item_id)
search_rel.where(event: :create).first_or_create!(
whodunnit: user.try(:id), whodunnit: user.try(:id),
object: nil, object: nil,
object_changes: server.each_with_object({}){|(k,v), h| h[k] = [nil, v]}, object_changes: server.each_with_object({}){|(k,v), h| h[k] = [nil, v]},
@ -112,7 +113,7 @@ module Legacy
if !version.object["ipv4"].sort.eql?(main_attrs[:ipv4]) || !version.object["ipv6"].sort.eql?(main_attrs[:ipv6]) if !version.object["ipv4"].sort.eql?(main_attrs[:ipv4]) || !version.object["ipv6"].sort.eql?(main_attrs[:ipv6])
object_changes = {} object_changes = {}
server.stringify_keys.each{|k, v| object_changes[k] = [v, version.object[k]] if v != version.object[k] } server.stringify_keys.each{|k, v| object_changes[k] = [v, version.object[k]] if v != version.object[k] }
to_import << version.item.versions.where(event: :update).build( to_import << search_rel.where(event: :update).build(
whodunnit: user.try(:id), whodunnit: user.try(:id),
object: server, object: server,
object_changes: object_changes, object_changes: object_changes,

2
lib/tasks/import_history.rake
View file

@ -6,7 +6,7 @@ namespace :import do
end end
def parallel_import all_ids def parallel_import all_ids
thread_pool = (Parallel.processor_count rescue 4) - 1 thread_pool = (Parallel.processor_count rescue 4)
threads = [] threads = []
all_ids.each_with_index do |one_id, i| all_ids.each_with_index do |one_id, i|