Commit 2c597b98e3c974fe0fad73c39002c76793d312c8
1 parent
2a03af5b
Exists in
master
and in
2 other branches
Updated mode pattern
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
lib/searchkick/index.rb
| @@ -349,7 +349,7 @@ module Searchkick | @@ -349,7 +349,7 @@ module Searchkick | ||
| 349 | 349 | ||
| 350 | # https://gist.github.com/jarosan/3124884 | 350 | # https://gist.github.com/jarosan/3124884 |
| 351 | # http://www.elasticsearch.org/blog/changing-mapping-with-zero-downtime/ | 351 | # http://www.elasticsearch.org/blog/changing-mapping-with-zero-downtime/ |
| 352 | - def full_reindex(relation, import: true, resume: false, retain: false, mode: :inline, refresh_interval: nil, scope: nil, wait: nil) | 352 | + def full_reindex(relation, import: true, resume: false, retain: false, mode: nil, refresh_interval: nil, scope: nil, wait: nil) |
| 353 | raise ArgumentError, "wait only available in :async mode" if !wait.nil? && mode != :async | 353 | raise ArgumentError, "wait only available in :async mode" if !wait.nil? && mode != :async |
| 354 | 354 | ||
| 355 | if resume | 355 | if resume |
| @@ -365,7 +365,7 @@ module Searchkick | @@ -365,7 +365,7 @@ module Searchkick | ||
| 365 | end | 365 | end |
| 366 | 366 | ||
| 367 | import_options = { | 367 | import_options = { |
| 368 | - mode: mode, | 368 | + mode: (mode || :inline), |
| 369 | full: true, | 369 | full: true, |
| 370 | resume: resume, | 370 | resume: resume, |
| 371 | scope: scope | 371 | scope: scope |