Add new execute button

ankane · Sep 13, 2024 · fe293e2 · fe293e2
1 parent 281fa8a
commit fe293e2
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/app/controllers/clockwork_web/home_controller.rb b/app/controllers/clockwork_web/home_controller.rb
@@ -35,5 +35,16 @@ def job
       ClockworkWeb.on_job_update.call(job: job, enable: enable, user: try(ClockworkWeb.user_method)) if ClockworkWeb.on_job_update
       redirect_to root_path
     end
+
+    def execute
+      job = params[:job]
+
+      event = Clockwork.manager.events.find { _1.job == params[:job] }
+
+      event.run(Time.now)
+      ClockworkWeb.set_last_run(event.job)
+
+      redirect_to root_path
+    end
   end
 end
diff --git a/app/views/clockwork_web/home/index.html.erb b/app/views/clockwork_web/home/index.html.erb
@@ -51,6 +51,10 @@
       .width-15 {
         width: 15%;
       }
+
+      .button-form {
+        display: inline-block;
+      }
     <% end %>
   </head>
   <body>
@@ -80,7 +84,7 @@
             <th>Job</th>
             <th class="width-15">Period</th>
             <th class="width-15">Last Run</th>
-            <th class="width-15">Action</th>
+            <th class="width-15">Actions</th>
           </tr>
         </thead>
         <tbody>
@@ -99,7 +103,10 @@
                 <% end %>
               </td>
               <td><%= last_run(@last_runs[event.job]) %></td>
-              <td><%= button_to enabled ? "Disable" : "Enable", home_job_path(job: event.job, enable: !enabled), disabled: !ClockworkWeb.redis %></td>
+              <td>
+                <%= button_to enabled ? "Disable" : "Enable", home_job_path(job: event.job, enable: !enabled), disabled: !ClockworkWeb.redis, form_class: 'button-form' %>
+                <%= button_to "Run now", home_execute_path(job: event.job), disabled: !ClockworkWeb.redis, form_class: 'button-form' %>
+              </td>
             </tr>
           <% end %>
         </tbody>

diff --git a/config/routes.rb b/config/routes.rb
@@ -1,4 +1,6 @@
 ClockworkWeb::Engine.routes.draw do
   post "home/job"
+  post "home/execute"
+
   root to: "home#index"
 end
diff --git a/lib/clockwork_web.rb b/lib/clockwork_web.rb
@@ -84,7 +84,7 @@ def self.last_heartbeat
   def self.heartbeat
     if redis
       heartbeat = Time.now.to_i
-      if heartbeat % 10 == 0
+      if heartbeat % 10 == 0 # every 10 seconds
         prev_heartbeat = redis.getset(HEARTBEAT_KEY, heartbeat).to_i
         if prev_heartbeat >= heartbeat
           redis.setex(STATUS_KEY, 60, "multiple")
@@ -110,15 +110,19 @@ module Clockwork
 
   on(:before_run) do |event, t|
     run = true
+
     Safely.safely do
       run = ClockworkWeb.enabled?(event.job)
-      if run
-        ClockworkWeb.set_last_run(event.job)
-      else
+      unless run
         manager.log "Skipping '#{event}'"
         event.last = event.convert_timezone(t)
       end
     end
+
     run
   end
+
+  on(:after_run) do |event, _t|
+    ClockworkWeb.set_last_run(event.job) if ClockworkWeb.enabled?(event.job)
+  end
 end