elastics-admin 1.0.9 → 1.0.10

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.10

data/lib/elastics/admin_live_reindex.rb

@@ -39,7 +39,7 @@ module Elastics
         end
         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 a live-reindex is in progress (PID #{get(:pid)}). If you are sure that there is no live-reindex in progress, please run the "elastics:reset_redis_keys" rake task and retry.) \
+        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
         set(:pid, $$)
@@ -168,7 +168,7 @@ module Elastics
         @stop_indexing.call
         Prompter.say_notice 'Indexing stopped.' if opts[:verbose]
       else
-        Prompter.say_warning 'No on_stop_indexing provided!' if opts[:verbose]
+        Prompter.say_notice 'No on_stop_indexing provided.' if opts[:verbose]
       end
 
       # if we have still changes, we can index them all, now that the indexing is stopped
@@ -205,7 +205,7 @@ module Elastics
     end
 
     def index_changes(opts)
-      left_changes_count = Redis.llen(:changes)
+      left_changes_count = Redis.llen(:changes) || 0
       return if left_changes_count == 0
 
       batch_size  = opts[:batch_size] || 100

data/lib/tasks.rake

@@ -12,6 +12,12 @@ namespace :elastics do
     desc 'Loads a dumpfile into Elasticsearch'
     task(:load => env) { Elastics::Admin::Tasks.new.load_from_file }
 
+    task(:reset_redis_keys) do
+      return unless Elastics::Conf.redis
+      ekeys = Elastics::LiveReindex::Redis::KEYS
+      ekeys.keys.each { |k| Elastics::Conf.redis.del "#{ekeys[k]}-#{ENV['APP_ID']}" }
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastics-admin
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-03 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.0.9
+        version: 1.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.0.10
 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