Move forced halt code into its own action

This commit is contained in:
Fabio Rehm 2013-03-11 00:08:28 -03:00
parent 02d56474df
commit 270cbd8a51
2 changed files with 24 additions and 4 deletions

View file

@ -6,6 +6,7 @@ require 'vagrant-lxc/action/check_running'
require 'vagrant-lxc/action/create' require 'vagrant-lxc/action/create'
require 'vagrant-lxc/action/created' require 'vagrant-lxc/action/created'
require 'vagrant-lxc/action/destroy' require 'vagrant-lxc/action/destroy'
require 'vagrant-lxc/action/forced_halt'
require 'vagrant-lxc/action/handle_box_metadata' require 'vagrant-lxc/action/handle_box_metadata'
require 'vagrant-lxc/action/is_running' require 'vagrant-lxc/action/is_running'
require 'vagrant-lxc/action/network' require 'vagrant-lxc/action/network'
@ -124,10 +125,7 @@ module Vagrant
if env[:result] if env[:result]
b2.use Vagrant::Action::Builtin::Call, Vagrant::Action::Builtin::GracefulHalt, :stopped, :running do |env2, b3| b2.use Vagrant::Action::Builtin::Call, Vagrant::Action::Builtin::GracefulHalt, :stopped, :running do |env2, b3|
if !env2[:result] && env2[:machine].provider.state.running? if !env2[:result] && env2[:machine].provider.state.running?
# TODO: Container#halt is kinda graceful as well, if it doesn't b3.use ForcedHalt
# or we can issue a lxc-stop. Might as well be handled by the
# container itself, who knows, we just need to handle it :P
env2[:machine].provider.container.halt
end end
end end
else else

View file

@ -0,0 +1,22 @@
module Vagrant
module LXC
module Action
class ForcedHalt
def initialize(app, env)
@app = app
end
def call(env)
if env[:machine].provider.state.running?
env[:ui].info I18n.t("vagrant.actions.vm.halt.force")
# TODO: Container#halt is kinda graceful as well, if it doesn't
# work we can issue a lxc-stop.
env[:machine].provider.container.halt
end
@app.call(env)
end
end
end
end
end