tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2018-10-08 13:51:33 +02:00
parent 96c3d26870 4c4ff05a46
commit d17844e6d1
58 changed files with 875 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mastodon/migration_helpers.rb
View File

@@ -342,8 +342,8 @@ module Mastodon
say "Migrating #{table_name}.#{column} (~#{total.to_i} rows)"
started_time = Time.now
last_time = Time.now
started_time = Time.zone.now
last_time = Time.zone.now
migrated = 0
loop do
stop_row = nil
@@ -375,13 +375,13 @@ module Mastodon
end
migrated += batch_size
if Time.now - last_time > 1
if Time.zone.now - last_time > 1
status = "Migrated #{migrated} rows"
percentage = 100.0 * migrated / total
status += " (~#{sprintf('%.2f', percentage)}%, "
remaining_time = (100.0 - percentage) * (Time.now - started_time) / percentage
remaining_time = (100.0 - percentage) * (Time.zone.now - started_time) / percentage
status += "#{(remaining_time / 60).to_i}:"
status += sprintf('%02d', remaining_time.to_i % 60)
@@ -397,7 +397,7 @@ module Mastodon
status += ')'
say status, true
last_time = Time.now
last_time = Time.zone.now
end
# There are no more rows left to update.