foreman-tasks 0.5.3 → 0.5.4

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -13,9 +13,50 @@ module ForemanTasks
           paginate(:page => params[:page])
     end
 
+    def resume
+      paused_task_action _('The execution was resumed.') do |task|
+        ForemanTasks.dynflow.world.execute(task.execution_plan.id)
+      end
+    end
+
+    def stop
+      paused_task_action _('The execution was stopped.') do |task|
+        # FIXME also stop dynflow execution plan
+        task.state = :stopped
+        task.save!
+      end
+    end
+
+    def force_stop
+      task       = find_task
+      task.state = :stopped
+      task.save!
+      flash[:notice] = _('The task was stopped with force.')
+      redirect_to foreman_tasks_task_path(task)
+    end
+
     # we need do this to make the Foreman helpers working properly
     def controller_name
       'foreman_tasks_tasks'
     end
+
+    private
+
+    def paused_task_action(success_message)
+      task = find_task
+      if task.state != 'paused'
+        flash[:warning] = _('The execution has to be paused.')
+      else
+        yield task
+        flash[:notice] = success_message
+      end
+
+      redirect_to foreman_tasks_task_path(task)
+    end
+
+    def find_task
+      ForemanTasks::Task::DynflowTask.find(params[:id])
+    end
+
   end
 end

data/app/lib/actions/entry_action.rb

@@ -14,6 +14,8 @@ module Actions
     #  * `:exclusive`:  same as `:all` + doesn't allow even linking to the resoruce.
     #                   typical example is deleting a container, preventing all actions
     #                   heppening on it's sub-resources (such a system).
+    #  * `:link`:       only link the task to the resource, not locking
+    #                   anything except exclusive locks
     def resource_locks
       :all
     end
@@ -34,6 +36,8 @@ module Actions
       if resource.is_a? ActiveRecord::Base
         if resource_locks == :exclusive
           exclusive_lock!(resource)
+        elsif resource_locks == :link
+          link!(resource)
         else
           lock!(resource, resource_locks)
         end

data/app/models/foreman_tasks/task.rb

@@ -3,6 +3,8 @@ require 'uuidtools'
 module ForemanTasks
   class Task < ActiveRecord::Base
 
+    # TODO missing validation of states
+
     self.primary_key = :id
     before_create :generate_id
 

data/app/views/foreman_tasks/tasks/show.html.erb

@@ -14,7 +14,75 @@
 </script>
 
 <div class="task-details">
+
   <%= form_for @task, :url => "#" do %>
+
+    <p>
+      <%= link_to(_('Dynflow console'),
+                  format('/foreman_tasks/dynflow/%s', @task.external_id),
+                  class: %w(btn btn-sm btn-info)) if Setting['dynflow_enable_console'] %>
+
+      <%= link_to(_('Resume'),
+                  resume_foreman_tasks_task_path(@task),
+                  class:  ['btn', 'btn-sm', 'btn-primary', ('disabled' unless @task.state == 'paused')].compact,
+                  method: :post) %>
+
+      <%= link_to(_('Stop'),
+                  '',
+                  class:         ['btn', 'btn-sm', 'btn-warning', ('disabled' unless @task.state == 'paused')].compact,
+                  :'data-toggle' => "modal",
+                  :'data-target' => "#stop_modal") %>
+
+      <%= link_to(_('Force Stop'),
+                  '',
+                  class:         %w(btn btn-sm btn-danger),
+                  :'data-toggle' => "modal",
+                  :'data-target' => "#force_stop_modal") %>
+    </p>
+
+    <div class="modal fade" id="stop_modal" tabindex="-1" role="dialog" aria-labelledby="Deploy" aria-hidden="true">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h2 class="modal-title" id="deploy_modal_label">
+              <span class="glyphicon glyphicon-warning-sign"></span>
+              <%= _("Stop") %>
+            </h2>
+          </div>
+          <div class="modal-body">
+            <%= _("This will stop the task and unlock the resources. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed") %>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
+            <%= link_to(_("Stop"), stop_foreman_tasks_task_path(@task), method: :post, class: 'btn btn-warning') %>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="modal fade" id="force_stop_modal" tabindex="-1" role="dialog" aria-labelledby="Deploy" aria-hidden="true">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h2 class="modal-title" id="deploy_modal_label">
+              <span class="glyphicon glyphicon-exclamation-sign"></span>
+              <%= _("Force Stop") %>
+            </h2>
+          </div>
+          <div class="modal-body">
+            <%= _("Resources will be unlocked and will not prevent other tasks from being run. As the task might be still running, it should be avoided to use this unless you are really sure the task got stuck") %>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
+            <%= link_to(_("Force Stop"), force_stop_foreman_tasks_task_path(@task), method: :post, class: 'btn btn-danger') %>
+          </div>
+        </div>
+      </div>
+    </div>
+
+
     <div>
       <span class="param-name"><%= _("Id") %>:</span>
       <span class="param-value"><%= @task.id %></span>
@@ -93,5 +161,21 @@
       <span class="param-name"><%= _("External Id") %>:</span>
       <span class="param-value"><%= @task.external_id %></span>
     </div>
+    <div>
+      <span class="param-name"><%= _("Locks") %>:</span>
+      <span class="param-value">
+        <ul>
+          <% @task.locks.each do |lock| %>
+            <li>
+              name: <%= lock.name %>
+              <br/>
+              resource: <%= format('%s id:%s', lock.resource_type, lock.resource_id) %>
+              <br/>
+              exclusive: <%= lock.exclusive %>
+            </li>
+          <% end %>
+        </ul>
+      </span>
+    </div>
   <% end %>
 </div>

data/config/routes.rb

@@ -4,6 +4,11 @@ Foreman::Application.routes.draw do
       collection do
         get 'auto_complete_search'
       end
+      member do
+        post :stop
+        post :resume
+        post :force_stop
+      end
     end
 
     namespace :api do

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails