about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorashleyhull-versent <ashley.hull@versent.com.au>2018-10-08 13:50:11 +1100
committerEugen Rochko <eugen@zeonfederated.com>2018-10-08 04:50:11 +0200
commitf194857ac9eeb85f9b27c056c556038aee23cb43 (patch)
treefa6f5dd3df450849f85924b7abbfdb40f73f036b /lib
parenta00ce8c92c06f42109aad5cfe65d46862cf037bb (diff)
rubocop issues - Cleaning up (#8912)
* cleanup pass

* undo mistakes

* fixed.

* revert
Diffstat (limited to 'lib')
-rw-r--r--lib/mastodon/migration_helpers.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 5c135685f..f5dc7e1c6 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -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.