resque-cluster 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bf1ebc287ae9f7b78cf7ca295827d8988b9583b
-  data.tar.gz: 16af99f4fab14ef60449da17553b210f239a3956
+  metadata.gz: c01c8144464501ef2314afdc09a673a490580f83
+  data.tar.gz: c31b0a48f3474c61f1ae76e9816432d12c93e4db
 SHA512:
-  metadata.gz: f0ef8475f4b4fef185b32e2241451859a2e2ffb34a6e93c2caa8b3094afe0d82e751bc4f3f66bdf26d475de237b67db807c65f7876de1bcae83d29743f90577c
-  data.tar.gz: cea48323e82d1c33d21c6a6e280e151d087bf8fb7694d377e70342ec68f78af0ac17e646c34d890cdc29e8e172b4d2d5bd60e64abc304098d6232d8e68e77fae
+  metadata.gz: 7689f5f5c61d328fe92f805d2273beb0468a66c6165b696122a99317c4930305f1891fab1487a4b7014b031ba7bc3c76f71036ebe8ea3ad5d7b0657c682b870c
+  data.tar.gz: 7147b14db7ec1f9051b849a9b6bcb2735205c3ee540fe97631cf29056b2351116400f2c21cd24bcded0ff4cd17a699fdc3d2653bdbdb447126b2846748b3363e

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'resque-pool', '~> 0.5.0'
-gem 'gru', '0.0.10'
+gem 'gru', '= 0.1.0'
 
 group :development do
   gem 'pry'

data/Gemfile.lock

@@ -3,8 +3,8 @@ GEM
   specs:
     addressable (2.3.8)
     ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
     awesome_print (1.6.1)
     builder (3.2.2)
     coderay (1.1.0)
@@ -23,9 +23,9 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
-    gru (0.0.10)
+    gru (0.1.0)
       redis (> 0.0)
-    hashie (3.4.1)
+    hashie (3.4.2)
     highline (1.7.2)
     jeweler (2.0.1)
       builder
@@ -36,13 +36,13 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.2)
-    jwt (1.5.0)
+    json (1.8.3)
+    jwt (1.5.1)
     method_source (0.8.2)
     mini_portile (0.6.2)
     mock_redis (0.15.0)
     mono_logger (1.1.0)
-    multi_json (1.11.0)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nokogiri (1.6.6.2)
@@ -53,21 +53,21 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    parser (2.2.2.2)
+    parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.1)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
     rainbow (2.0.0)
     rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.2.1)
+    redis (3.2.2)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     resque (1.25.2)
@@ -92,9 +92,9 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    rubocop (0.31.0)
+    rubocop (0.32.1)
       astrolabe (~> 1.3)
-      parser (>= 2.2.2.1, < 3.0)
+      parser (>= 2.2.2.5, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
@@ -108,7 +108,7 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    slop (3.5.0)
+    slop (3.6.0)
     thread_safe (0.3.5)
     tilt (2.0.1)
     trollop (2.1.2)
@@ -121,7 +121,7 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   bundler (~> 1.0)
-  gru (= 0.0.10)
+  gru (= 0.1.0)
   jeweler (~> 2.0.1)
   mock_redis (~> 0.15.0)
   pry

data/lib/resque/cluster/member.rb

@@ -13,21 +13,13 @@ module Resque
         @global_config = parse_config(Cluster.config[:global_config_path])
         @global_config = @local_config if global_config.empty?
         @worker_count_manager = initialize_gru
-
-        register
       end
 
       def perform
         check_for_worker_count_adjustment
-        ping
-      end
-
-      def register
-        ping
       end
 
       def unregister
-        unping
         remove_counts
         unqueue_all_workers
       end
@@ -51,18 +43,6 @@ module Resque
         "#{member_prefix}:running_workers"
       end
 
-      def ping_namespace
-        global_prefix + ":pings"
-      end
-
-      def ping
-        Resque.redis.hset(ping_namespace, hostname, Time.now.utc)
-      end
-
-      def unping
-        Resque.redis.hdel(ping_namespace, hostname)
-      end
-
       def initialize_gru
         Gru.create(cluster_member_settings)
       end
@@ -113,7 +93,8 @@ module Resque
           rebalance_flag:   @global_config["rebalance_cluster"] || false,
           cluster_name:     Cluster.config[:cluster_name],
           environment_name: Cluster.config[:environment],
-          presume_host_dead_after: @global_config["presume_dead_after"] || 120
+          presume_host_dead_after: @global_config["presume_dead_after"] || 120,
+          manage_worker_heartbeats: true
         }
       end
     end

data/lib/resque/cluster/version.rb

@@ -1,5 +1,5 @@
 module Resque
   class Cluster
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/spec/unit/member_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Resque::Cluster::Member do
   end
 
   after :all do
-    Resque::Cluster.member.unregister
+    Resque::Cluster.member
     Resque::Cluster.config = nil
     Resque::Cluster.member = nil
   end
@@ -29,13 +29,14 @@ RSpec.describe Resque::Cluster::Member do
         :rebalance_flag => false,
         :presume_host_dead_after => 120,
         :cluster_name => "unit-test-cluster",
-        :environment_name => "unit-test"
+        :environment_name => "unit-test",
+        :manage_worker_heartbeats => true
       }
     end
 
     it 'returns a correct cluster settings hash' do
       expect(Resque::Cluster.member.send(:cluster_member_settings)).to eq(@settings_hash)
-      Resque::Cluster.member.unregister
+      Resque::Cluster.member
     end
 
     it 'returns a correct cluster settings hash with global_config with a rebalance param' do
@@ -46,16 +47,6 @@ RSpec.describe Resque::Cluster::Member do
     end
   end
 
-  context '#register' do
-    before :all do
-      @member.register
-    end
-
-    it 'pings into redis to let the rest of the cluster know of it' do
-      expect(@redis.hget('resque:cluster:unit-test-cluster:unit-test:pings', @@hostname)).to_not be_nil
-    end
-  end
-
   context '#check_for_worker_count_adjustment' do
     before :all do
       @redis.hset("GRU:unit-test:unit-test-cluster:global:max_workers","bar",2)
@@ -75,27 +66,10 @@ RSpec.describe Resque::Cluster::Member do
     end
   end
 
-  context '#unregister' do
-    before :all do
-      @member.unregister
-    end
-
-    it 'removes everything about itself from redis' do
-      expect(@redis.hget('resque:cluster:unit-test-cluster:unit-test', @@hostname)).to be_nil
-      expect(@redis.get("resque:cluster:unit-test-cluster:unit-test:#{@@hostname}:running_workers")).to be_nil
-    end
-
-    it 'moves all the current running workers into the global queue if rebalance_on_termination is set to true' do
-      expect(@redis.hget('GRU:unit-test:unit-test-cluster:global:workers_running', 'bar')).to eq '0'
-      expect(@redis.hget('GRU:unit-test:unit-test-cluster:global:workers_running', 'foo')).to eq '0'
-      expect(@redis.hget("GRU:unit-test:unit-test-cluster:#{@@hostname}:workers_running", 'bar')).to be_nil
-      expect(@redis.hget("GRU:unit-test:unit-test-cluster:#{@@hostname}:workers_running", 'foo')).to be_nil
-    end
-  end
-
   after :all do
     @redis.del("GRU:unit-test:unit-test-cluster:global:max_workers")
     @redis.del("GRU:unit-test:unit-test-cluster:global:workers_running")
+    @redis.del("GRU:unit-test:unit-test-cluster:heartbeats")
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Yasha Portnoy