Numeric#from_now/ago is removed, convert to AS::Duration first.

Fixes: undefined method `from_now' for 600:Fixnum See also: rails/rails#12389
tenderlove · Jan 8, 2015 · 3face31 · 3face31
1 parent 16acdf7
commit 3face31
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/vmdb/app/models/vm_or_template.rb b/vmdb/app/models/vm_or_template.rb
@@ -405,7 +405,7 @@ def powerops_callback(task_id, status, msg, result, queue_item)
   end
 
   def self.powerops_expiration
-    (VMDB::Config.new('vmdb').config.fetch_path(:management_system, :power_operation_expiration) || 10.minutes).to_i_with_method.from_now.utc
+    (VMDB::Config.new('vmdb').config.fetch_path(:management_system, :power_operation_expiration) || 10.minutes).to_i_with_method.seconds.from_now.utc
   end
 
   def self.invoke_tasks_local(options)

diff --git a/vmdb/app/models/vmdb_metric/purging.rb b/vmdb/app/models/vmdb_metric/purging.rb
@@ -6,7 +6,7 @@ def purge_date(interval)
       type  = "keep_#{interval}_metrics".to_sym
       value = VMDB::Config.new("vmdb").config.fetch_path(:database, :metrics_history, type)
       value = value.to_i.days if value.kind_of?(Fixnum) # Default unit is days
-      value = value.to_i_with_method.ago.utc unless value.nil?
+      value = value.to_i_with_method.seconds.ago.utc unless value.nil?
       value
     end