zoo-service-discovery 1.0.1 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTlmOWI4ZGM5YzM0NWExNWMyZDA5NDExYzRlN2NhNGYzZWI1YjY3OA==
+    MzEyY2YzNDY0ZWI5ODY1OTkzYjVlMzgyMmM1NjJiZGY5Y2NiNjk1ZA==
   data.tar.gz: !binary |-
-    ZGM1YTJiOWRkZDhlMDBiZjRlMzNiNWQ0MDhiMDJiZDMyNTRiZDUwMA==
+    ZTY1YjJkMzc2ZjA0NmQzMjgwZmQ4NGM2ZWVjYjkyNWIyOTgzYTg2NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjA2OGI2OGVhYzM1NjUyODE4MDk4MjJlNGY2Y2ZkNTIxZDQ2MGIzODhiMTUw
-    M2UyNWJmMWIzZjI0MDM5YmZjNzEzMmFkMzEyZWU3NDU0Yjg3MmY5MDA1Yzdi
-    MmRmZmZiZTc0NTczYThhNWIyNTkxZjU5ZjgxNzIzMWMwZDhlODM=
+    OGU3NmM0ODYwNGQ4N2VjNzAyMDY5ZjhiNzdlOWZjZWFkNjliN2FkYzMyM2Rj
+    MWU5ZDllYzBlMGJlYTZlNzZkOTdlZjAxMTkwODY2MDYwMGRhMWIzNmI1MzYz
+    YTAzZDY1MDI0ZmE5NjY2NTFjMWU1NjFmN2I5YjMzM2FjMGI0NDE=
   data.tar.gz: !binary |-
-    NGQ2YTNhMjFhMTYyZWUxNDM2ZmRjZjg4MGYzYWMxZDBmNWQwY2QxYjFlMWE0
-    ODdmZjI2MjQ3NzE0YTIyMGRhODAzMTI2Mzk5MmRhZjAyYjAyZWVmODAxY2Yw
-    OTA3YTRiZTRiNzQ5MTMxMzczNWJjYzJjMzEzODU1NDc5Yjc2NWQ=
+    MGZlZGM5NmZjMDU4M2NkYTIzODkyYzZjMDQ3OGU5OTZjZTI3NGY2MzlmM2Rk
+    YjViOGRkZjk4N2NjMzBhMDFhNmExMzFjZDYyOTM1YTcyMDRhZGFhM2NiYzUw
+    NTdjNDQ2Nzg0ZjJmOTQ2MjM4OGY3NzQyNDBhM2IwYzMxMzZmYzc=

data/lib/zoo-service-discovery.rb

@@ -1,2 +1,3 @@
 require_relative 'zoo_service/discovery'
 require_relative 'zoo_service/publication'
+require_relative 'zoo_service/client_factory'

data/lib/zoo_service/discovery.rb

@@ -4,42 +4,39 @@ require 'zk'
 module ZooService
 
   # Performs service discovery for a HTTP service consumer.
-  class Discovery
-    class << self
-      # :call-seq:
-      #   get_service_url(name) => String
-      #
-      # Gets service URL by _name_.
-      #
-      # Returns service URL, if everything went OK, +nil+ otherwise.
-      def get_service_url(name)
-        get_published_urls(name).first
-      end
-
-    protected
-
-      # Gets published URLs of _service_name_.
-      def get_published_urls(service_name)
-        service_path = "/services/#{service_name}"
-        publications = zk.children(service_path, ignore: :no_node) || [ ]
+  class DiscoveryImpl
+
+    # :call-seq:
+    #   get_service_url(name) => String
+    #
+    # Gets service URL by _name_.
+    #
+    # Returns service URL, if everything went OK, +nil+ otherwise.
+    def get_service_url(name)
+      get_published_urls(name).first
+    end
 
-        unless publications.empty?
-          zk.get("#{service_path}/#{publications.last}", ignore: :no_node)
-        else
-          [ ]
-        end
-      end
+  protected
 
-      # Returns a working instance of a ZooKeeper client.
-      def zk
-        if Thread.current[:service_discovery_zk_client]
-          return Thread.current[:service_discovery_zk_client]
-        end
+    # Gets published URLs of _service_name_.
+    def get_published_urls(service_name)
+      service_path = "/services/#{service_name}"
+      publications = zk.children(service_path, ignore: :no_node) || [ ]
 
-        Thread.current[:service_discovery_zk_client] ||= ZK.new(ENV['SERVICE_DISCOVERY_WELLKNOWN_ADDRESS'] || 'localhost:2181')
+      unless publications.empty?
+        zk.get("#{service_path}/#{publications.last}", ignore: :no_node)
+      else
+        [ ]
       end
+    end
 
+    # Returns a working instance of a ZooKeeper client.
+    def zk
+      @zk ||= ZK.new(ENV['SERVICE_DISCOVERY_WELLKNOWN_ADDRESS'] || 'localhost:2181')
     end
+
   end
 
+  Discovery = DiscoveryImpl.new
+
 end

data/lib/zoo_service/publication.rb

@@ -4,56 +4,64 @@ require 'zk'
 module ZooService
 
   # Performs service publication for a HTTP service provider.
-  class Publication
-    class << self
-      # :call-seq:
-      #   register_service(name, url) => Boolean
-      #
-      # Registers a well-known service with _name_ at _url_.
-      #
-      # Returns +true+, if everything went OK, +false+ otherwise.
-      def register_service(name, url)
-        registration_block = create_registration_block(name, url)
-        service_registration_blocks << registration_block
-        registration_block.(zk)
+  class PublicationImpl
+
+    def initialize(phusion_passenger = nil)
+      return unless phusion_passenger
+      phusion_passenger.on_event(:starting_worker_process) do |forked|
+        if forked
+          reconnect
+        end
       end
+    end
 
-    protected
+    # :call-seq:
+    #   register_service(name, url) => Boolean
+    #
+    # Registers a well-known service with _name_ at _url_.
+    #
+    # Returns +true+, if everything went OK, +false+ otherwise.
+    def register_service(name, url)
+      registration_block = create_registration_block(name, url)
+      service_registration_blocks << registration_block
+      registration_block.(zk)
+    end
 
-      # Creates a lambda that once called registeres the service on the URL.
-      def create_registration_block(name, url)
-        -> zk {
-          service_path = "/services/#{name}"
-          zk.mkdir_p(service_path) unless zk.exists?(service_path)
-          zk.create("#{service_path}/node-", url, mode: :ephemeral_sequential)
-        }
-      end
+    def reconnect
+      @zk = nil
+      zk
+    end
 
-      # Stores the registration blocks that are rerun after reconnection to
-      # the ZooKeeper.
-      def service_registration_blocks
-        @service_registration_blocks ||= [ ]
-      end
+  protected
 
-      # Returns a working instance of a ZooKeeper client.
-      def zk
-        if Thread.current[:service_publication_zk_client]
-          return Thread.current[:service_publication_zk_client]
-        end
+    # Creates a lambda that once called registeres the service on the URL.
+    def create_registration_block(name, url)
+      -> zk {
+        service_path = "/services/#{name}"
+        zk.mkdir_p(service_path) unless zk.exists?(service_path)
+        zk.create("#{service_path}/node-", url, mode: :ephemeral_sequential)
+      }
+    end
+
+    # Stores the registration blocks that are rerun after reconnection to
+    # the ZooKeeper.
+    def service_registration_blocks
+      @service_registration_blocks ||= [ ]
+    end
 
-        zk_client = ZK.new(ENV['SERVICE_DISCOVERY_WELLKNOWN_ADDRESS'] || 'localhost:2181') do |zk|
-          zk.on_connected do
-            # Rerun all the registrations upon reconnection
-            service_registration_blocks.each do |registration_block|
-              registration_block.(zk)
-            end
+    # Returns a working instance of a ZooKeeper client.
+    def zk
+      @zk ||= ZK.new(ENV['SERVICE_DISCOVERY_WELLKNOWN_ADDRESS'] || 'localhost:2181') do |zk|
+        zk.on_connected do
+          # Rerun all the registrations upon reconnection
+          service_registration_blocks.each do |registration_block|
+            registration_block.(zk)
           end
         end
-
-        Thread.current[:service_publication_zk_client] = zk_client
       end
-
     end
+
   end
 
+  Publication = defined?(PhusionPassenger) ? PublicationImpl.new(PhusionPassenger) : PublicationImpl.new
 end

data/spec/features/complex_discovery_spec.rb

@@ -4,41 +4,30 @@ describe "Discovered service URL (registered in a separate process)" do
 
   def kill_server_process
     begin
-      Process.kill("HUP", server_process)
+      Process.kill("KILL", server_process)
       Process.wait(server_process)
     rescue Errno::ESRCH
       # ignore
     end
   end
 
-  before {
-    if Thread.current[:service_discovery_zk_client]
-      Thread.current[:service_discovery_zk_client].close
-      Thread.current[:service_discovery_zk_client] = nil
-    end
-
-    if Thread.current[:service_publication_zk_client]
-      Thread.current[:service_publication_zk_client].close
-      Thread.current[:service_publication_zk_client] = nil
-    end
-  }
-
   subject {
-    ZooService::Discovery.get_service_url(service)
+    ZooService::DiscoveryImpl.new.get_service_url(service)
   }
 
   let(:real_service_url) {
     "http://sample.dev/"
   }
 
-  let(:service) {
-    "service"
+  let!(:service) {
+    "service%4.4d%4.4d" % [ rand(9999), rand(9999) ]
   }
 
   let!(:server_process) {
     pid = fork do |variable|
-      ZooService::Publication.register_service(service, real_service_url)
-      sleep 1 while true
+      ZooService::PublicationImpl.new.register_service(service, real_service_url)
+      sleep 60 # fail safely after 60 secs
+      exit
     end
     sleep 0.5
     return pid
@@ -57,11 +46,10 @@ describe "Discovered service URL (registered in a separate process)" do
   end
 
   it "retains value when ZooKeeper fails and restarts with an empty DB" do
-    should == real_service_url
-
     ZookeeperRunner.clean
     ZookeeperRunner.stop
     ZookeeperRunner.start
+    sleep 10
 
     should == real_service_url
   end

data/spec/features/discovery_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Discovered service URL" do
 
   subject {
-    ZooService::Discovery.get_service_url(service)
+    ZooService::DiscoveryImpl.new.get_service_url(service)
   }
 
   let(:real_service_url) {
@@ -13,7 +13,7 @@ describe "Discovered service URL" do
   context "when service is registered" do
 
     let!(:service) {
-      ZooService::Publication.register_service("service", real_service_url)
+      ZooService::PublicationImpl.new.register_service("service", real_service_url)
       "service"
     }
 

data/spec/features/passenger_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+class PhusionPassenger
+  class << self
+    def on_event(event, &block)
+      @events ||= {}
+      @events[event] = block
+    end
+
+    def start
+      fork do
+        # Phusion Passenger user request handler
+        @events[:starting_worker_process].call(true)
+        sleep 10
+        exit
+      end
+    end
+  end
+end
+
+describe "Publication service" do
+
+  describe "when started on Passenger" do
+    let!(:service) {
+      "service%4.4d%4.4d" % [ rand(9999), rand(9999) ]
+    }
+
+    let(:url) {
+      "http://pornhub.com/"
+    }
+
+    subject {
+      ZooService::DiscoveryImpl.new.get_service_url(service)
+    }
+
+    before do
+      fork do
+        # Phusion Passenger starter
+        ZooService::PublicationImpl.new(PhusionPassenger).register_service(service, url)
+        PhusionPassenger.start
+        exit
+      end
+
+      sleep 1 # we love sleeping in these tests
+    end
+
+    it { should == url }
+  end
+
+
+  describe "when started on other(non-Passenger) server" do
+    it "should not reconnect" do
+      expect(ZooService::PublicationImpl.new).not_to receive(:reconnect)
+    end
+  end
+
+end

data/spec/support/zookeeper_runner.rb

@@ -2,13 +2,15 @@ class ZookeeperRunner
   class << self
 
     def start
-      system "zkServer start > /dev/null 2>&1"
-      wait_zookeeper_start
+      until `zkServer start 2>&1`.include?("already running")
+        sleep 1
+      end
     end
 
     def stop
-      system "zkServer stop > /dev/null 2>&1"
-      wait_zookeeper_stop
+      until `zkServer stop 2>&1`.include?("no zookeeper to stop")
+        sleep 1
+      end
     end
 
     def clean
@@ -17,20 +19,5 @@ class ZookeeperRunner
       end
     end
 
-    protected
-
-    def wait_zookeeper_start
-      sleep 1 while zookeeper_pid == 0
-    end
-
-    def wait_zookeeper_stop
-      sleep 0.125 while zookeeper_pid > 0
-    end
-
-    def zookeeper_pid
-      `ps aux | grep zookeeper | grep java | grep -v grep | awk '{ print $2; }'`.to_i
-    end
-
-
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: zoo-service-discovery
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Druzhinin <andrey.druginin@gmail.com>
+- Ramil Gilmanov <ramil1985@mail.ru>
 - Ivan Kasatenko <sky@uniqsystems.ru>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zk
@@ -36,6 +37,7 @@ files:
 - lib/zoo_service/publication.rb
 - spec/features/complex_discovery_spec.rb
 - spec/features/discovery_spec.rb
+- spec/features/passenger_spec.rb
 - spec/spec_helper.rb
 - spec/support/zookeeper_runner.rb
 - README.md