Refactor agent runner and scheduler

Multiple fixes and refactorings in preparation for completely new runner
architecture.

Refactor agent running and scheduling code into a separate component.

Remove SchedulerAgent (to be implemented as core funtionality).

Multiple other changes.

Author: Vidas P

.rubocop.yml

@@ -1,8 +1,22 @@
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
 Metrics/ModuleLength:
   Enabled: false
 Metrics/ClassLength:
   Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 Style/NumericPredicate:
   Enabled: false

CHANGELOG.md

@@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - Wunderlist agent removed (service has shut down).
 
+### Changed
+- Remove SchedulerAgent (to be implemented as a core functionality).
+- Refactor agent runner and scheduler.
+
 
 ## [0.9.8] - 2020-05-11
 ### Fixed

Makefile

@@ -2,10 +2,6 @@
 start:
 	bundle exec foreman start
 
-.PHONY: setup-heroku
-setup-heroku:
-	bundle exec bin/setup_heroku
-
 .PHONY: build-image
 build-image:
 	docker build -t local/active_workflow .

Procfile

@@ -1,8 +1,7 @@
-web: bundle exec puma -C ./deployment/heroku/puma.rb
-
 # Use configuration bellow to run jobs on a separate dyno.
-#web: bundle exec puma
-#jobs: bundle exec rails runner bin/threaded.rb
+web: bundle exec puma
+scheduler: bundle exec rails runner bin/pro_scheduler.rb
+worker: bundle exec script/delayed_job -n 4 run
 
 ###############################
 # Multiple DelayedJob workers #

README.md

@@ -205,10 +205,6 @@ These are agents that control the workflow and perform common and simple data pr
  	<td><strong>JavaScript Agent</strong></td>
  	<td>Allows you to write JavaScript code that can create and receive messages. If other agents aren’t meeting your needs, try this one!</td>
  </tr>
- <tr>
- 	<td><strong>Scheduler Agent</strong></td>
- 	<td>Periodically takes an action on target agents according to a user-defined schedule.</td>
- </tr>
  <tr>
  	<td><strong>Attribute&nbsp;Difference&nbsp;Agent</strong></td>
  	<td>Receives messages and emits a new message with the difference or change of a specific attribute in comparison to the message received.</td>
@@ -342,19 +338,11 @@ source tree, you could do that using Heroku's command line interface.
 Please install Heroku's command line interface tool from
 [Heroku Toolbelt](https://toolbelt.heroku.com).
 
-For your convenience there is a helper script that guides you through all the
-steps necessary to deploy to Heroku. It helps with Heroku app creation, plugin
-installation, initial configuration and repository synchronisation. Helper
-script is run with:
-
-```sh
-make setup-heroku
-```
-
 For additional configuration options please take a look at the `.env` file.
 Don't forget to set any configuration options you may require using the
 `heroku config` command line tool.
 
+FIXME:
 The default ActiveWorkflow configuration uses the same single dyno to run both
 the web server and workers.
 

app/assets/javascripts/components/worker-checker.js

@@ -1,9 +1,10 @@
 $(function() {
-  let sinceId = null;
   let previousJobs = null;
 
   if ($(".job-indicator").length) {
     var check = function() {
+      let sinceId = $("#message-indicator").data("sinceId");
+
       const query =
         (sinceId != null) ?
           `?since_id=${sinceId}`
@@ -41,7 +42,8 @@ $(function() {
           $("#message-indicator").tooltip('dispose').fadeOut();
         }
 
-        if (sinceId == null) { sinceId = json.max_id; }
+        $("#message-indicator").data("sinceId", json.max_id);
+
         const currentJobs = [json.pending, json.awaiting_retry, json.recent_failures];
         if ((document.location.pathname === '/jobs') && ($(".modal[aria-hidden=false]").length === 0) && (previousJobs != null) && (previousJobs.join(',') !== currentJobs.join(','))) {
           if (!document.location.search || (document.location.search === '?page=1')) {

app/assets/javascripts/pages/workflow-show-page.js

@@ -1,15 +1,16 @@
 this.WorkflowShowPage = class WorkflowShowPage {
   constructor() {
+    this.changeModalText();
   }
 
   changeModalText() {
     $('.disable-all-agents').click(function() {
-      $('#enable-disable-agents .modal-body-action').text('Would you like to disable all agents?');
       $('#workflow-disabled-value').val('true');
+      $('#enable-disable-agents .modal-body-action').text('Would you like to disable all agents?');
     });
     $('.enable-all-agents').click(function() {
-      $('#enable-disable-agents .modal-body-action').text('Would you like to enable all agents?');
       $('#workflow-disabled-value').val('false');
+      $('#enable-disable-agents .modal-body-action').text('Would you like to enable all agents?');
     });
   }
 };

app/concerns/long_runnable.rb

@@ -1,17 +1,18 @@
 class WorkerStatusController < ApplicationController
   def show
     start = Time.now
-    messages = current_user.messages
 
-    if params[:since_id].present?
-      since_id = params[:since_id].to_i
-      messages = messages.where('id > ?', since_id)
-    end
+    since_id = params[:since_id].presence || 0
+
+    messages = current_user.messages.where('id > ?', since_id)
 
     result = messages.select('COUNT(id) AS count', 'MAX(id) AS max_id')
       .reorder(Arel.sql('min(created_at)')).first
     count, max_id = result.count, result.max_id
 
+    # Max aggregate only works if there are any new messages.
+    max_id = since_id if count == 0
+
     render json: {
       pending: Delayed::Job.pending.where('run_at <= ?', start).count,
       awaiting_retry: Delayed::Job.awaiting_retry.count,

app/controllers/worker_status_controller.rb

@@ -27,12 +27,8 @@ def agent_from_job(job)
     case data['job_class']
     when 'AgentCheckJob', 'AgentReceiveJob'
       Agent.find_by_id(data['arguments'][0])
-    when 'AgentRunScheduleJob'
-      "Run Agent schedule '#{data['arguments'][0]}'"
     when 'AgentCleanupExpiredJob'
       'Run Message cleanup'
-    when 'AgentPropagateJob'
-      'Run Message propagation'
     else
       false
     end