em-hiredis-sentinel 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c8ccc312f11d82490c468f1f9c1d57b0c6bf5d4b
+  data.tar.gz: 897d83b49139778d1d4301211299e0f879e4653e
+SHA512:
+  metadata.gz: 9b7a1da78bd352bbb479b38eb896390f19d3737235ef3db6d4cbf6fd1da23a3ea1c54d19889773d5d11ad2bb884596ed8e48cdec0c2bad327bfc9693247a4731
+  data.tar.gz: a4f59fc33c645c0526979d3b04d80e9325231004b311b0ab475c17816a6daedcc8bc7eac60b236528bdc3ad0e0425edaf8b33e90e3c07d22515d761136b24181

data/.gitignore

@@ -0,0 +1,24 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+.idea/
+*.log

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gem 'em-hiredis', :git => 'git://github.com/mloughran/em-hiredis'
+# Specify your gem's dependencies in em-hiredis-sentinel.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Justin Schneck
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,41 @@
+# Em::Hiredis::Sentinel
+
+Sentinel Support for em-hiredis. Currently this gem does not fully monkey patch the em-hiredis gem in place.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'em-hiredis-sentinel'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install em-hiredis-sentinel
+
+## Usage
+
+    require 'em-hiredis-sentinel'
+    redis_sentinel = EM::Hiredis::Client.new('127.0.0.1',6379,nil,nil,
+                                                :sentinels => [
+                                                    {:host => '127.0.0.1', :port => 26379},
+                                                    {:host => '127.0.0.1', :port => 26380},
+                                                    {:host => '127.0.0.1', :port => 26381}
+                                                ],
+                                                :master_name => 'mymaster').connect
+
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/em-hiredis-sentinel/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request
+
+## TODO
+
+1. Add RSpec tests

data/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+

data/em-hiredis-sentinel.gemspec

@@ -0,0 +1,23 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'em-hiredis-sentinel/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "em-hiredis-sentinel"
+  spec.version       = EventMachine::Hiredis::Sentinel::VERSION
+  spec.authors       = ["Justin Schneck"]
+  spec.email         = ["jschneck@mac.com"]
+  spec.summary       = %q{Redis Sentinel for em-hiredis}
+  spec.description   = %q{}
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_dependency 'em-hiredis'
+end

data/examples/getting_started.rb

@@ -0,0 +1,28 @@
+$:.unshift(File.expand_path('../../lib', __FILE__))
+require 'em-hiredis-sentinel'
+require 'logger'
+
+EM.run {
+
+  EM::Hiredis.logger = Logger.new('output.log')
+
+
+  redis_sentinel = EM::Hiredis::Client.new('127.0.0.1',6379,nil,nil,
+                                                :sentinels => [
+                                                    {:host => '127.0.0.1', :port => 26379},
+                                                    {:host => '127.0.0.1', :port => 26380},
+                                                    {:host => '127.0.0.1', :port => 26381}
+                                                ],
+                                                :master_name => 'mymaster').connect
+
+  EM.add_periodic_timer(1) {
+    puts "Connected: #{redis_sentinel.connected?}"
+    response_deferrable = redis_sentinel.get('foo')
+    response_deferrable.callback { |value|
+      puts value
+    }
+    response_deferrable.errback { |e|
+      puts e
+    }
+  }
+}

data/examples/pubsub.rb

@@ -0,0 +1,21 @@
+$:.unshift(File.expand_path('../../lib', __FILE__))
+require 'em-hiredis-sentinel'
+require 'logger'
+
+EM.run {
+
+  EM::Hiredis.logger = Logger.new('output.log')
+
+
+  redis_sentinel = EM::Hiredis::Client.new('127.0.0.1',6379,nil,nil,
+                                                :sentinels => [
+                                                    {:host => '127.0.0.1', :port => 26379},
+                                                    {:host => '127.0.0.1', :port => 26380},
+                                                    {:host => '127.0.0.1', :port => 26381}
+                                                ],
+                                                :master_name => 'mymaster').connect
+
+  redis_sentinel.pubsub.subscribe('foo') { |msg|
+    puts msg
+  }
+}

data/lib/em-hiredis-sentinel/base_client.rb

@@ -0,0 +1,139 @@
+module EventMachine::Hiredis
+  class BaseClient
+    class_eval {
+      attr_reader :sentinel_options
+
+      def initialize_with_sentinel(host = 'localhost', port = 6379, password = nil, db = nil, sentinel_options={})
+        #@options = sentinel_options.dup
+        puts "SentinelOptions: #{sentinel_options}"
+        initialize_without_sentinel(host,port,password,db)
+        if sentinel_options.nil? || sentinel_options.empty?
+          return
+        end
+
+        @sentinel_options = sentinel_options.dup
+        @master_name = @sentinel_options[:master_name]
+        @sentinels_options = _parse_sentinel_options(@sentinel_options[:sentinels])
+
+        @current_sentinel = EM::Hiredis::Client.new(@sentinels_options[0][:host],@sentinels_options[0][:port]).connect
+        @current_sentinel.on(:disconnected) {
+          EM::Hiredis.logger.info('Sentinel Failed')
+          try_next_sentinel
+        }
+
+        #discover_master
+        watch_sentinel
+        
+      end
+
+      alias initialize_without_sentinel initialize
+      alias initialize initialize_with_sentinel
+
+      def watch_sentinel
+        pubsub = @current_sentinel.pubsub
+        pubsub.punsubscribe('*')
+        pubsub.psubscribe('*')
+        pubsub.on(:pmessage) { |pattern, channel, message|
+          puts "Channel:#{channel}"
+          puts "Message:#{message}"
+          next if channel != '+switch-master'
+
+          master_name, old_host, old_port, new_host, new_port = message.split(" ")
+
+          next if master_name != @master_name
+
+          #@options.merge!(host: new_host, port: new_port.to_i)
+          EM::Hiredis.logger.info("Failover: #{old_host}:#{old_port} => #{new_host}:#{new_port}")
+          close_connection
+          @host, @port = new_host,new_port.to_i
+          reconnect_connection
+        }
+      end
+
+      def try_next_sentinel
+
+        sentinel_options = @sentinels_options.shift
+        @sentinels_options.push sentinel_options
+
+        puts "Trying next sentinel: #{sentinel_options[:host]}:#{sentinel_options[:port]}" #if @logger && @logger.debug?
+        @current_sentinel.close_connection
+        @current_sentinel.configure("redis://#{sentinel_options[:host]}:#{sentinel_options[:port]}")
+        @current_sentinel.reconnect_connection
+        unless @switching_sentinels
+          @switching_sentinels = true
+          @sentinel_timer = EM.add_periodic_timer(1) {
+            puts 'Trying New Sentinel Connection'
+            if @current_sentinel.connected?
+              @switching_sentinels = false
+              @sentinel_timer.cancel
+              #watch_sentinel
+            else
+              try_next_sentinel
+            end
+          }
+        end
+      end
+
+      def discover_master
+        response_deferrable = @current_sentinel.sentinel("get-master-addr-by-name", @master_name)
+        response_deferrable.callback { |value|
+          master_host, master_port = value
+
+          if master_host && master_port
+
+            # An ip:port pair
+            #@options.merge!(:host => master_host, :port => master_port.to_i, :password => @master_password)
+            #close_connection
+            @host, @port = master_host,master_port.to_i
+            reconnect_connection
+            refresh_sentinels_list
+          else
+            EM.next_tick {
+              self.discover_master
+            }
+          end
+        }
+        response_deferrable.errback { |e|
+          EM.next_tick {
+            self.discover_master
+          }
+        }
+      end
+
+      def refresh_sentinels_list
+        response_deferrable = @current_sentinel.sentinel("sentinels", @master_name)
+        response_deferrable.callback { |sentinels|
+          sentinels.each { |sentinel|
+            @sentinels_options << {:host => sentinel[3], :port => sentinel[5]}
+            @sentinels_options.uniq! {|h| h.values_at(:host, :port) }
+          }
+        }
+        response_deferrable.errback { |e|
+          try_next_sentinel
+        }
+      end
+
+      private
+
+      def _parse_sentinel_options(options)
+        return if options.nil?
+
+        sentinel_options = []
+        options.each do |opts|
+          opts = opts[:url] if opts.is_a?(Hash) && opts.key?(:url)
+          case opts
+            when Hash
+              sentinel_options << opts
+            else
+              uri = URI.parse(opts)
+              sentinel_options << {
+                  :host => uri.host,
+                  :port => uri.port
+              }
+          end
+        end
+        sentinel_options
+      end
+    }    
+  end
+end

data/lib/em-hiredis-sentinel/client.rb

@@ -0,0 +1,11 @@
+module EventMachine::Hiredis
+  class Client < BaseClient
+    class_eval {
+      def pubsub
+        @pubsub ||= begin
+          PubsubClient.new(@host, @port, @password, @db, @sentinel_options).connect
+        end
+      end
+    }
+  end
+end

data/lib/em-hiredis-sentinel/pubsub_client.rb

@@ -0,0 +1,12 @@
+module EventMachine::Hiredis
+  class PubsubClient < BaseClient
+    class_eval {
+      def initialize(host='localhost', port='6379', password=nil, db=nil, sentinel_options={})
+        puts "Initializing with sentinel: #{sentinel_options}"
+        @subs, @psubs = [], []
+        @pubsub_defs = Hash.new { |h,k| h[k] = [] }
+        super
+      end
+    }
+  end
+end

data/lib/em-hiredis-sentinel/version.rb

@@ -0,0 +1,9 @@
+require 'eventmachine'
+
+module EventMachine
+  module Hiredis
+    module Sentinel
+      VERSION = '0.1.1'
+    end
+  end
+end

data/lib/em-hiredis-sentinel.rb

@@ -0,0 +1,14 @@
+require 'em-hiredis'
+require 'em-hiredis-sentinel/client'
+require 'em-hiredis-sentinel/base_client'
+require 'em-hiredis-sentinel/pubsub_client'
+
+module EventMachine::Hiredis
+  class_eval {
+    def self.connect_sentinel(options={})
+      # Should Return an EM-Hiredis client with added sentinel support
+      sentinel_client = EM::Hiredis::Sentinel::Client.new options
+      sentinel_client.redis_client
+    end
+  }
+end

metadata

@@ -0,0 +1,99 @@
+--- !ruby/object:Gem::Specification
+name: em-hiredis-sentinel
+version: !ruby/object:Gem::Version
+  version: 0.1.1
+platform: ruby
+authors:
+- Justin Schneck
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2014-06-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-hiredis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ''
+email:
+- jschneck@mac.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- em-hiredis-sentinel.gemspec
+- examples/getting_started.rb
+- examples/pubsub.rb
+- lib/em-hiredis-sentinel.rb
+- lib/em-hiredis-sentinel/base_client.rb
+- lib/em-hiredis-sentinel/client.rb
+- lib/em-hiredis-sentinel/pubsub_client.rb
+- lib/em-hiredis-sentinel/version.rb
+homepage: ''
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
+specification_version: 4
+summary: Redis Sentinel for em-hiredis
+test_files: []