chronofage 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 708bb7f6a4836dbe1089bc0a2a699fe8fad2740c
-  data.tar.gz: 2a717b066b6454e01a5c88ac38c8da5e0eda1f77
+  metadata.gz: 498b0dbe5d30b21f61a61378999edeb50f9cabc6
+  data.tar.gz: 424313e1ee691839fdf396d649b1e8698e767cc6
 SHA512:
-  metadata.gz: 170565c678b3c0d277b523657e198ebf1d89e4dd2612955c2550c60166d475088a85a4cd0f81645fbc20bfd870fdc9b4fd7b8f9ab59a12d415260ec7e49e900d
-  data.tar.gz: 8a39277b4cf3572751ef1a1e2e47b86e6cdcd1530b72319ced3bb604bca8c33d6727a663ed1f0e34e53b7a14549a2f2a8352b8baa0470fb2f4942c3289e970e8
+  metadata.gz: 35f775eba0d751a1bc759b36e329ac96db33e9b3bd09f36fa57f2fa7fabbd3551c5907ae0d24e952389e2f7c38fd8c90324d82e9dd88218e14ba54778fbb4ef7
+  data.tar.gz: 41c3823387b3f5da300959c5b7b03ef51e3c1d7e82e057925ac68efffe440231cd8034373689911de8f4af812e61cbd0d8900330358235af90393b5addfaccdb

data/README.md

@@ -6,7 +6,7 @@ is run in its own process and you can spread the work on multiple hosts.
 
 ## Installation
 
-Copy the migration file and run it to create the `chronofage_jobs` and `chronofage_runners` tables.
+Copy the migration file and run it to create the `chronofage_jobs` table.
 
 ```
 rake chronofage_engine:install:migrations db:migrate
@@ -29,17 +29,6 @@ create_table "chronofage_jobs", force: :cascade do |t|
 end
 ```
 
-The `chronofage_runners` table hold informations about the process currently running.
-
-```
-create_table "chronofage_runners", force: :cascade do |t|
-  t.string   "queue_name"
-  t.string   "host"
-  t.datetime "created_at", null: false
-  t.datetime "updated_at", null: false
-end
-```
-
 ## Usage
 
 You can selectively override the ActiveJob backend for your very long-runny task.

data/db/migrate/1_create_job_table.rb

@@ -1,15 +1,20 @@
 class CreateJobTable < ActiveRecord::Migration[5.0]
   def change
     create_table :chronofage_jobs do |t|
-      t.string   :job_class
-      t.string   :job_id
-      t.string   :queue_name
-      t.text     :arguments
-      t.integer  :priority
+      t.string     :job_class
+      t.string     :job_id
+      t.string     :queue_name
+      t.text       :arguments
+      t.integer    :priority
+
+      t.string     :host
+      t.text       :stdout
+      t.text       :stderr
+
+      t.datetime   :started_at
+      t.datetime   :completed_at
+      t.datetime   :failed_at
 
-      t.datetime :started_at
-      t.datetime :completed_at
-      t.datetime :failed_at
       t.timestamps
     end
   end

data/lib/chronofage.rb

@@ -3,7 +3,6 @@ require 'active_record/version'
 require 'active_support/core_ext/module'
 require 'active_job/queue_adapters/chronofage_adapter'
 require 'chronofage/job'
-require 'chronofage/runner'
 
 begin
   require 'rails/engine'

data/lib/chronofage/job.rb

@@ -3,6 +3,11 @@ module Chronofage
     self.table_name = "chronofage_jobs"
 
     scope :ready, -> { where(started_at: nil) }
+    scope :started, -> { where.not(started_at: nil).where(failed_at: nil, completed_at: nil) }
+
+    def self.next(queue_name)
+      ready.where(queue_name: queue_name).order(priority: :asc).first
+    end
 
     def execute!
       start!
@@ -14,20 +19,42 @@ module Chronofage
     end
 
     def start!
-      update(started_at: Time.now)
+      update!(started_at: Time.now, host: Chronofage::Job.host)
     end
 
     def done!
-      update(completed_at: Time.now)
+      update!(completed_at: Time.now)
     end
 
     def failed!
-      update(failed_at: Time.now)
+      update!(failed_at: Time.now)
     end
 
     def deserialized_arguments
       ActiveJob::Arguments.deserialize(JSON.parse(arguments))
     end
 
+    def concurrents
+      Chronofage::Job.started.where(queue_name: queue_name, host: Chronofage::Job.host)
+    end
+
+    def state
+      if started_at.present? && completed_at.present?
+        :completed
+      elsif started_at.present? && failed_at.present?
+        :failed
+      elsif started_at.present?
+        :running
+      else
+        :ready
+      end
+    end
+
+    private
+
+    def self.host
+      Socket.gethostname
+    end
+
   end
 end

data/lib/chronofage/version.rb

@@ -1,3 +1,3 @@
 module Chronofage
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/tasks/chronofage.rake

@@ -1,17 +1,9 @@
 namespace :chronofage_engine do
   namespace :jobs do
     task :execute, [:queue_name, :concurrency] => :environment do |t, args|
-      job = Chronofage::Job.ready.where(queue_name: args.queue_name).order(priority: :asc).first
-
-      if job.nil?
-        Rails.logger.info "chronofage[#{args.queue_name}]: no job to execute."
-      else
-        runner = Chronofage::Runner.register!(args.queue_name, args.concurrency.to_i)
-        begin
-          job.execute!
-        ensure
-          runner.unregister!
-        end
+      job = Chronofage::Job.next(args.queue_name)
+      if job.present? && job.concurrents.count < args.concurrency.to_i
+        job.execute!
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronofage
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Victor Goya
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies: []
 description: Cron based job scheduler
 email:
@@ -25,12 +25,10 @@ files:
 - Rakefile
 - chronofage.gemspec
 - db/migrate/1_create_job_table.rb
-- db/migrate/2_create_runner_table.rb
 - lib/active_job/queue_adapters/chronofage_adapter.rb
 - lib/chronofage.rb
 - lib/chronofage/engine.rb
 - lib/chronofage/job.rb
-- lib/chronofage/runner.rb
 - lib/chronofage/version.rb
 - lib/tasks/chronofage.rake
 homepage: https://www.amusenetwork.com/

data/db/migrate/2_create_runner_table.rb

@@ -1,10 +0,0 @@
-class CreateRunnerTable < ActiveRecord::Migration[5.0]
-  def change
-    create_table :chronofage_runners do |t|
-      t.string   :queue_name
-      t.string   :host
-
-      t.timestamps
-    end
-  end
-end

data/lib/chronofage/runner.rb

@@ -1,33 +0,0 @@
-require 'socket'
-
-module Chronofage
-  class Runner < ::ActiveRecord::Base
-    self.table_name = "chronofage_runners"
-
-    class MaxConcurrencyReached < StandardError
-    end
-
-    def self.register!(queue_name, concurrency)
-      if concurrent_runnners(queue_name).count >= concurrency
-        raise MaxConcurrencyReached
-      else
-        create!(queue_name: queue_name, host: host)
-      end
-    end
-
-    def self.concurrent_runnners(queue_name)
-      where(queue_name: queue_name, host: host)
-    end
-
-    def unregister!
-      destroy!
-    end
-
-    private
-
-    def self.host
-      Socket.gethostname
-    end
-
-  end
-end