simpleci-worker 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0160576a6f99b17570fd7e4105d4196df48b94b
-  data.tar.gz: 01aca32edce7d70828f9e1f66cf68d2895e02dff
+  metadata.gz: 724b1852c4dec6537db709453b0ca9b3f0058fe8
+  data.tar.gz: ad2062d63d27371735b47baf59dc84aaa03ab04c
 SHA512:
-  metadata.gz: 29f24fe261b00489c6a2628e401e2420e3c0734cc27e790ac6b185e82cc514e244cf1b1e20c782b9103979f6a92367685fc28a17dda732876c24952016e48104
-  data.tar.gz: f9bd8109167221d6e5f88fcbca97f3090627d19121a695884d9e9585c291cb05dcba38d7996f88455168c5c6962dda6befeb246f48a0a87c9ada498c3490e121
+  metadata.gz: f3728a34c2ce129dc461a34b5cde6559bf57c707b2396b297047db9fb90d1c6d1eead50820fab9b02df6e8a8f27512b6836e1fd1564dd0663a4fe049b66f7849
+  data.tar.gz: 75ead4be80821aaeb335d945031cc71a9cfe0bb082eaa7de2379ce38b0a3cc670f55897f1d03ffce62a4611619480f2b4e68127989d0be70f24c8b88da23ce06

data/Gemfile

@@ -4,4 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'sqlite3'
+gem 'mysql2'
 gem 'activerecord'

data/lib/worker/queue.rb

@@ -26,6 +26,8 @@ module Worker
       @poll_interval = opts[:poll_interval] || 5 # 5 second polling
       @log_backtrace = !!opts[:log_backtrace]
 
+      @db_adapter = db_config[:adapter]
+
       create_table
     end
 
@@ -61,10 +63,19 @@ module Worker
 
     # locks a set of jobs for this worker
     def dequeue
-      query = db[:worker_jobs]
-                  .where(
-                      '`run_at` < ? AND `locked_by` IS NULL AND `id` in (SELECT `id` FROM `worker_jobs` ORDER BY `priority` DESC LIMIT ?)',
-                      Time.now, jobs_per_worker)
+
+      if @db_adapter == 'mysql2' || @db_adapter == 'mysql'
+        query = db[:worker_jobs]
+                    .limit(jobs_per_worker)
+                    .where('`run_at` < ?', Time.now)
+                    .where('`locked_by` IS NULL')
+                    .reverse_order('priority')
+      else
+        query = db[:worker_jobs]
+                    .where(
+                        '`run_at` < ? AND `locked_by` IS NULL AND `id` in (SELECT `id` FROM `worker_jobs` ORDER BY `priority` DESC LIMIT ?)',
+                        Time.now, jobs_per_worker)
+      end
 
       if queue_name
         query = query.where(queue: queue_name)

data/lib/worker/version.rb

@@ -1,3 +1,3 @@
 module Worker
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simpleci-worker
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Colin Walker