elastics-admin 1.1.5 → 1.1.6

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/lib/elastics/admin_live_reindex.rb

@@ -36,9 +36,20 @@ module Elastics
               unless Conf.redis.class.to_s == 'Redis'
         raise MissingAppIdError, 'You must set the Elastics::Configuration.app_id, and be sure you deploy it before live-reindexing.' \
               if Conf.app_id.nil? || Conf.app_id.empty?
-        raise LiveReindexInProgressError, %(It looks like the live-reindex of "#{Conf.app_id}" is in progress (PID #{get(:pid)}). If you are sure that there is no live-reindex in progress, please run the "elastics:admin:reset_redis_keys APP_ID=#{Conf.app_id}" rake task and retry.) \
-              if get(:pid)
-        reset_keys # just in case
+
+        if get(:pid) && (pid = get(:pid).to_i)
+          message = begin
+                      Process.kill(0, pid)
+                      %(The live-reindex of "#{Conf.app_id}" is in progress (PID #{pid}).)
+                    rescue Errno::ESRCH
+                      # no process running (will reset_keys and continue)
+                    rescue Exception
+                      %(It looks like the live-reindex of "#{Conf.app_id}" is in progress (PID #{pid}). If you are sure that there is no live-reindex in progress, please run the "elastics:admin:reset_redis_keys APP_ID=#{Conf.app_id}" rake task and retry.)
+                    end
+          raise LiveReindexInProgressError, message if message
+        end
+
+        reset_keys
         set(:pid, $$)
       end
 

data/lib/elastics-admin.rb

@@ -13,4 +13,4 @@ if redis_installed
   Elastics::Conf.redis = $redis || ::Redis.current
 end
 
-Elastics::Conf.optimize_indexing = true
+Elastics::Conf.optimize_indexing = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastics-admin
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elastics-client
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.6
 description: Provides binary and rake tasks to dump, load and optionally rename indices.
   Implements live-reindex with hot-swap of old code/index with new code/index.
 email: dd.nexus@gmail.com