lib/vagrant-notify/middleware/stop_server.rb in vagrant-notify-0.0.1 vs lib/vagrant-notify/middleware/stop_server.rb in vagrant-notify-0.1.0
- old
+ new
@@ -23,19 +23,24 @@
def stop_server(pid)
Process.kill('KILL', pid.to_i) rescue nil
end
def cleanup_local_data(env)
+ uuid = env[:vm].uuid.to_s
local_data = env[:vm].env.local_data
local_data['vagrant-notify'] ||= Vagrant::Util::HashWithIndifferentAccess.new
- local_data['vagrant-notify'].delete('pid')
+ local_data['vagrant-notify'].delete(uuid)
local_data.commit
end
# REFACTOR: This is duplicated on Middleware::StartServer
def server_is_running?(env)
+ uuid = env[:vm].uuid.to_s
begin
- pid = env[:vm].env.local_data.fetch('vagrant-notify', {}).fetch('pid', nil)
+ pid = env[:vm].env.local_data.
+ fetch('vagrant-notify', {}).
+ fetch(uuid, {}).
+ fetch('pid', nil)
return false unless pid
Process.getpgid(pid.to_i)
pid
rescue Errno::ESRCH