chronofage 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ee0775738a92e85081cbd4afc18c66c94423f3f7
-  data.tar.gz: 816e76884914b74ce4b02e8a0136f2e3be36b460
+SHA256:
+  metadata.gz: 00a1b933b3475c55e9261d46f3cf75b15aa5dd5633c631ee3575661afdbde825
+  data.tar.gz: 0f19dd4fcbc79dfdf337074a53f1d89c20557f4c6b1d273cd30e36223baefbd5
 SHA512:
-  metadata.gz: cba9f3f8749cbbd31cf7cd337be47e9b0d4bbecd7804d7ce09b7afab4c34811db96185b9ef5b6c359dc97f97341994862761ad5a514119c93f3a86867ac95b17
-  data.tar.gz: 726e890335bc5080b024b0e0c025ff69511dadd25d0347d25357b18452dae849913c6741e32969c70cfd09a8913042e3e355b092fbba3225f0defbcc04043575
+  metadata.gz: b7bfef5758997d659e6bbc3867a1bb048b857464471394cc8643bf012dc932f1fbb78884255b34bc42d93f5c5a8614f864ef9ec88cb542a16ff5adaf738dcce6
+  data.tar.gz: 20c4b24bb82dc453c2e763c92276288db870cb474e3f03e085466274c1911568d8a9dc95243235da3c6a5ef95ec1f4f8f6d8776bc36be01f2798035537a47927

data/README.md

@@ -57,3 +57,9 @@ of 6 jobs, 2 for each host, and check for new jobs every 5 minutes.
 ```
 */5 * * * * cd /var/www/my_app && rake chronofage_engine:jobs:execute[heavy,2]
 ```
+
+You can also make Chronofage poll the database for new jobs to execute, this solution is way more reactive.
+
+```
+rake chronofage_engine:jobs:poll[heavy,2]
+```

data/lib/chronofage/job.rb

@@ -5,12 +5,12 @@ module Chronofage
     scope :ready, -> { where(started_at: nil) }
     scope :started, -> { where.not(started_at: nil).where(failed_at: nil, completed_at: nil) }
 
-    def self.take_next(queue_name, concurrency)
+    def self.take_next(queue_name, concurrency, global_concurrency)
       ActiveRecord::Base.transaction do
         ActiveRecord::Base.connection.execute('LOCK chronofage_jobs IN ACCESS EXCLUSIVE MODE')
 
         job = ready.where(queue_name: queue_name).order(priority: :asc).first
-        if job.present? && job.concurrents.count < concurrency
+        if job.present? && job.concurrents.count < concurrency && (global_concurrency == 0 || job.global_concurrents.count < global_concurrency)
           job.started!
           job
         else
@@ -64,7 +64,11 @@ module Chronofage
     end
 
     def concurrents
-      Chronofage::Job.started.where(queue_name: queue_name, host: Chronofage::Job.host)
+      global_concurrents.where(host: Chronofage::Job.host)
+    end
+
+    def global_concurrents
+      Chronofage::Job.started.where(queue_name: queue_name)
     end
 
     def state

data/lib/chronofage/version.rb

@@ -1,3 +1,3 @@
 module Chronofage
-  VERSION = "0.0.11"
+  VERSION = "0.0.13"
 end

data/lib/tasks/chronofage.rake

@@ -1,8 +1,30 @@
 namespace :chronofage_engine do
   namespace :jobs do
-    task :execute, [:queue_name, :concurrency] => :environment do |t, args|
-      job = Chronofage::Job.take_next(args.queue_name, args.concurrency.to_i)
+    task :execute, [:queue_name, :concurrency, :global_concurrency] => :environment do |t, args|
+      job = Chronofage::Job.take_next(args.queue_name, args.concurrency.to_i, args.global_concurrency.to_i)
       job.perform if job.present?
     end
+
+    task :poll, [:queue_name, :concurrency, :global_concurrency] => :environment do |t, args|
+      loop do
+        job = Chronofage::Job.take_next(args.queue_name, args.concurrency.to_i, args.global_concurrency.to_i)
+        if job.blank?
+          sleep 1
+          next
+        end
+
+        ActiveRecord::Base.connection.disconnect!
+
+        pid = fork do
+          Process.daemon
+
+          ActiveRecord::Base.establish_connection
+          job.perform
+        end
+        Process.detach(pid)
+
+        ActiveRecord::Base.establish_connection
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronofage
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Victor Goya
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies: []
 description: Cron based job scheduler
 email:
@@ -52,8 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Cron based job scheduler