Merge pull request #24 from thommay/time

Use unix timestamps rather than strings
chef-boneyard · Jun 18, 2014 · 3978d19 · 3978d19
2 parents 6e7bea8 + 8034326
commit 3978d19
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lib/chef_metal_fog/fog_driver.rb b/lib/chef_metal_fog/fog_driver.rb
@@ -269,7 +269,7 @@ def create_server(action_handler, machine_spec, machine_options)
           'driver_version' => ChefMetalFog::VERSION,
           'server_id' => server.id,
           'creator' => creator,
-          'allocated_at' => Time.now.utc.to_s
+          'allocated_at' => Time.now.to_i
         }
         machine_spec.location['key_name'] = bootstrap_options[:key_name] if bootstrap_options[:key_name]
         %w(is_windows ssh_username sudo use_private_ip_for_ssh ssh_gateway).each do |key|
@@ -291,7 +291,7 @@ def start_server(action_handler, machine_spec, server)
       if server.state == 'stopped'
         action_handler.perform_action "start machine #{machine_spec.name} (#{server.id} on #{driver_url})" do
           server.start
-          machine_spec.location['started_at'] = Time.now.utc.to_s
+          machine_spec.location['started_at'] = Time.now.to_i
         end
         machine_spec.save(action_handler)
       end
@@ -300,16 +300,16 @@ def start_server(action_handler, machine_spec, server)
     def restart_server(action_handler, machine_spec, server)
       action_handler.perform_action "restart machine #{machine_spec.name} (#{server.id} on #{driver_url})" do
         server.reboot
-        machine_spec.location['started_at'] = Time.now.utc.to_s
+        machine_spec.location['started_at'] = Time.now.to_i
       end
       machine_spec.save(action_handler)
     end
 
     def remaining_wait_time(machine_spec, machine_options)
       if machine_spec.location['started_at']
-        timeout = option_for(machine_options, :start_timeout) - (Time.now.utc - Time.parse(machine_spec.location['started_at']))
+        timeout = option_for(machine_options, :start_timeout) - (Time.now.utc - Time.at(machine_spec.location['started_at']))
       else
-        timeout = option_for(machine_options, :create_timeout) - (Time.now.utc - Time.parse(machine_spec.location['allocated_at']))
+        timeout = option_for(machine_options, :create_timeout) - (Time.now.utc - Time.at(machine_spec.location['allocated_at']))
       end
       timeout > 0 ? timeout : 0.01
     end