delayed_job_es 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c88fb7a192a3120949ca0ed3632f4baaf9feb2f8
-  data.tar.gz: aa663a7f03dafebbf16b08639212c96cfe0915c1
+  metadata.gz: 4fd671a6bb8f35764c38d1acd3c7f2b29e3eea26
+  data.tar.gz: 9655192518c56711d3a5f06f318a9e3dbd7f5dcd
 SHA512:
-  metadata.gz: 8cbadc3e99718b31ac0f761b9f08212af85db8711fbb31310633c2c5a530a504fb0bf67ce07ebdce630580d4adfc507674550f3f543df342b4a97924f8fd60a4
-  data.tar.gz: 5ade19e9c69b8937e4bb6264c60f4b382089c8ca9fac6fc7ae9d8a55e6119ab2d2060028f652982720f680f0238249dc92c4257922c52947b729122507c21aac
+  metadata.gz: d7863a77e1da57fe74f39731dc069feb2f42a981607bb3e9a86d0a4f10be88dcbea05f017c7500795dea1b25f52db4359972b199d01a89cef925d53b2ae13b3e
+  data.tar.gz: 84b681c6cd05ffc38665f095a9ccfb718a9fbcbf72a2dcf9d140728fa05f20bd03d18f7a36678a2c82ee8eb2e076d7b9bea54f39ab55ab39d41f0109073be8f4

data/README.md

@@ -1,8 +1,12 @@
 # DelayedJobEs
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/delayed_job_es`. To experiment with that code, run `bin/console` for an interactive prompt.
+Delayed Job Backend adapter for ElasticSearch.
+
+
+The gem uses the 'elasticsearch-transport' and 'elasticsearch-api' as dependencies.
+
+It has no other dependencies, and should be easy to integrate into any ruby based project that uses elasticsearch in any form.
 
-TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
@@ -14,7 +18,7 @@ gem 'delayed_job_es'
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
@@ -22,13 +26,68 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Job Class
+
+Create a Job Class in the app/jobs folder :
+
+```
+  	class BackgroundJob < ActiveJob::Base
+  
+  		queue_as :default
+
+  		## Specify the queue adapter as delayed_job_es
+  		self.queue_adapter = :delayed_job
+
+  		self.logger = Logger.new(nil) if Rails.env.test? 
+
+	  	rescue_from(StandardError) do |exception|
+	  		puts exception.message
+	   		puts exception.backtrace.join("\n")
+	  	end
+  
+  		def perform(args)
+  			## process job here.
+  		end
+
+  	end
+```
+
+### Es Indexes
+
+Create required ES Indexes:
+
+
+```ruby
+# in the rails console, (you only need to do this once)
+DelayedJob::Backend::Es::Job.create_indices
+```
+
+### Job Daemon
+
+Open a terminal window, navigate to your project and run :
+
+	$ bundle exec rake jobs:work
+
+This will run a job daemon(standard DelayedJob).
+
+
+### Queue a Job
+
+To queue a job, from anywhere using the job class above run (you can try this in the rails console, in another window):
+
+
+```ruby
+BackgroundJob.perform_later({"hello" => "world"})
+```
+
+If you look in the jobs daemon window, you will see the job getting processed.
+
+
+
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/lib/delayed/backend/es.rb

@@ -9,6 +9,7 @@ module Delayed
 		module Es
 			class Job
 				attr_accessor :id
+				attr_accessor :version
 		        attr_accessor :priority
 		        attr_accessor :attempts
 		        attr_accessor :handler
@@ -335,18 +336,20 @@ module Delayed
 
 					search_response = get_client.search :index => INDEX_NAME, :type => DOCUMENT_TYPE,
 						:body => {
+							version: true,
 							size: limit,
 							sort: sort,
 							query: query
 						}
 					
 
-					#puts "search_response is"
-					#puts search_response["hits"]["hits"]
+					puts "search_response is"
+					puts search_response["hits"]["hits"]
 					## it would return the first hit.
 					search_response["hits"]["hits"].map{|c|
 						k = new(c["_source"])
 						k.id = c["_id"]
+						k.version = c["_version"]
 						k
 					}
 
@@ -362,21 +365,38 @@ module Delayed
 						:lang => "painless",
 						:params => {
 							:locked_at => self.class.db_time_now.strftime("%Y-%m-%d %H:%M:%S"),
-							:locked_by => worker
+							:locked_by => worker,
+							:version => self.version
 						},
 						:source => '''
-							ctx._source.locked_at = params.locked_at;
-							ctx._source.locked_by = params.locked_by;
+							if(ctx._version == params.version){
+								ctx._source.locked_at = params.locked_at;
+								ctx._source.locked_by = params.locked_by;
+							}
+							else{
+								ctx.op = "none";
+							}
 						'''
 					}
+
+					puts "Script is"
+					puts JSON.pretty_generate(script)
+
+
 					#begin
 					response = self.class.get_client.update(index: INDEX_NAME, type: DOCUMENT_TYPE, id: self.id.to_s, body: {
 						:script => script,
 						:scripted_upsert => false,
 						:upsert => {}	
 					})
-				
-		          self
+
+					## if this returns no-op chec,
+					puts "lock response:"
+					puts response.to_s
+					
+
+					return response["result"] == "updated"
+		          
 		        end
 
 		        def self.db_time_now

data/lib/delayed_job_es/version.rb

@@ -1,3 +1,3 @@
 module DelayedJobEs
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_es
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Great Manta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler