lib/searchkick.rb in searchkick-0.8.2 vs lib/searchkick.rb in searchkick-0.8.3

@@ -10,25 +10,39 @@
 require "searchkick/reindex_job"
 require "searchkick/model"
 require "searchkick/tasks"
 require "searchkick/logging" if defined?(Rails)
 
+# background jobs
+begin
+  require "active_job"
+rescue LoadError
+  # do nothing
+end
+require "searchkick/reindex_v2_job" if defined?(ActiveJob)
+
 module Searchkick
   class MissingIndexError < StandardError; end
   class UnsupportedVersionError < StandardError; end
   class InvalidQueryError < Elasticsearch::Transport::Transport::Errors::BadRequest; end
 
   class << self
     attr_accessor :callbacks
     attr_accessor :search_method_name
     attr_accessor :wordnet_path
+    attr_accessor :timeout
   end
   self.callbacks = true
   self.search_method_name = :search
   self.wordnet_path = "/var/lib/wn_s.pl"
+  self.timeout = 10
 
   def self.client
-    @client ||= Elasticsearch::Client.new(url: ENV["ELASTICSEARCH_URL"])
+    @client ||=
+      Elasticsearch::Client.new(
+        url: ENV["ELASTICSEARCH_URL"],
+        transport_options: {request: {timeout: timeout}}
+      )
   end
 
   def self.client=(client)
     @client = client
   end