attention 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d854a64d0631d2acc718ee5d310ee1e492e2e2cf
-  data.tar.gz: c4403ff3290f181ff6f1f7f5fd63225ee54def8b
+  metadata.gz: afeb250d478f294f9f153c598f9d198dc25114c5
+  data.tar.gz: 86e3566582dbac6d8e738a4c96c7b11630b54c86
 SHA512:
-  metadata.gz: 91daaa57e01146e683e8fba37fd3c94c5b1a868ef7602f5aacbdf2ab57397ffd9c1a2f66caab2fc0d4f6d966d45467f55d4c35956e4ccfb3c97c503bc9497fcc
-  data.tar.gz: dd233e7e2ee479f9f87d0cc361de3c0f4d5fb9865970dfb7668460e42d80f970e35450a1c5aca0823d87995bdda8ef29cbba33ed3d72f88dc73a80c4d921d59d
+  metadata.gz: acdbf5c64e70a65ad2e6f76adf8e9e863b564932bafca4700a46776a13091184e919b5fa0ac838d64f5002d1cf5729098d7dd6cf5c255bbf0af359a7a24d911d
+  data.tar.gz: fc294d634ea642cc40945192839b996971deb48881d83a71f732308c25ca215b96737dfcc6b7bba2bce77aa295888c4a200d35ffca0b35674b38ec4debb5c0d9

data/attention.gemspec

@@ -19,11 +19,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0.2'
+  spec.add_runtime_dependency 'concurrent-ruby-ext', '~> 1.0.2'
   spec.add_runtime_dependency 'redis', '~> 3'
   spec.add_runtime_dependency 'redis-namespace', '~> 1.5'
   spec.add_runtime_dependency 'connection_pool', '~> 2'
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'rspec-its', '~> 1.2'

data/lib/attention.rb

@@ -4,7 +4,6 @@ require 'attention/redis_pool'
 require 'attention/subscriber'
 require 'attention/blocking_subscriber'
 require 'attention/instance'
-require 'attention/timer'
 
 # The top-level API
 # 

data/lib/attention/instance.rb

@@ -1,6 +1,6 @@
 require 'socket'
+require 'concurrent'
 require 'attention/publisher'
-require 'attention/timer'
 
 module Attention
   # A publishable representation of the current server
@@ -49,10 +49,10 @@ module Attention
     # Unpublishes this server and stops the {#heartbeat}
     def unpublish
       return unless @heartbeat
+      @heartbeat.shutdown
       publisher.publish('instance', removed: info) do |redis|
         redis.del "instance_#{ @id }"
       end
-      @heartbeat.stop
       @heartbeat = nil
     end
 
@@ -67,14 +67,17 @@ module Attention
 
     private
 
-    # Uses a {Timer} to periodically tell Redis that this
+    # Uses a {Concurrent::TimerTask} to periodically tell Redis that this
     # server is still online
     # @!visibility public
     # @api private
     def heartbeat
-      @heartbeat ||= Timer.new(heartbeat_frequency) do
-        Attention.redis.call.expire "instance_#{ @id }", Attention.options[:ttl]
+      return @heartbeat if @heartbeat
+      @heartbeat = Concurrent::TimerTask.new(execution_interval: heartbeat_frequency) do
+        Attention.redis.call.setex "instance_#{ @id }", Attention.options[:ttl], JSON.dump(info)
       end
+      @heartbeat.execute
+      @heartbeat
     end
 
     # The frequency of the {#heartbeat} is based on Attention.options[:ttl]

data/lib/attention/version.rb

@@ -1,3 +1,3 @@
 module Attention
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: attention
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby-ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +219,6 @@ files:
 - lib/attention/publisher.rb
 - lib/attention/redis_pool.rb
 - lib/attention/subscriber.rb
-- lib/attention/timer.rb
 - lib/attention/version.rb
 homepage: https://github.com/parrish/attention
 licenses:
@@ -213,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Redis-based server awareness

data/lib/attention/timer.rb

@@ -1,52 +0,0 @@
-require 'thread'
-
-module Attention
-  # Periodic asynchronous code execution
-  class Timer
-    attr_reader :frequency
-
-    # @!visibility private
-    attr_reader :callback, :lock, :thread
-
-    # Creates and {#start}s the timer
-    # @param frequency [Numeric] How often to execute
-    # @yield The code to be executed
-    def initialize(frequency, &callback)
-      @frequency = frequency
-      @callback = callback
-      @lock = Mutex.new
-      start
-    end
-
-    # Starts the timer
-    def start
-      @thread ||= Thread.new do
-        loop do
-          sleep @frequency
-          lock.synchronize do
-            callback.call
-          end
-        end
-      end
-    end
-
-    # @return [Boolean] True if the timer is started
-    def started?
-      !!thread
-    end
-
-    # Stops the timer if it's started
-    def stop
-      return if stopped?
-      lock.synchronize do
-        thread.kill
-        @thread = nil
-      end
-    end
-
-    # @return [Boolean] True if the timer is stopped
-    def stopped?
-      !started?
-    end
-  end
-end