zookeeper 1.0.4 → 1.0.5

data/.ctags_paths

@@ -0,0 +1 @@
+~/vendor/ruby/*.{c,h}

data/CHANGELOG

@@ -1,3 +1,9 @@
+v1.0.5 Minor cleanup
+
+  * Fix the InheritedConnectionError message
+
+  * Clean up the module includes
+
 v1.0.3 Linux: Fix hang on reopen after fork
 
   * Linux users relying on fork() should upgrade to 1.0.3, as it

data/Rakefile

@@ -100,3 +100,6 @@ end
 
 task 'spec:run' => 'build:clean' unless defined?(::JRUBY_VERSION)
 
+# because i'm a creature of habit
+task 'mb:test_all' => 'zk:test_all'
+

data/ext/c_zookeeper.rb

@@ -1,3 +1,4 @@
+require_relative '../lib/zookeeper/logger'
 require_relative '../lib/zookeeper/common'
 require_relative '../lib/zookeeper/constants'
 require_relative 'zookeeper_c'
@@ -8,9 +9,10 @@ require_relative 'zookeeper_c'
 #       when we're garbage collected
 module Zookeeper
 class CZookeeper
-  include Zookeeper::Forked
-  include Zookeeper::Constants
-  include Zookeeper::Exceptions
+  include Forked
+  include Constants
+  include Exceptions
+  include Logger
 
   DEFAULT_SESSION_TIMEOUT_MSEC = 10000
 
@@ -223,10 +225,6 @@ class CZookeeper
       end
     end
 
-    def logger
-      Zookeeper.logger
-    end
-
     # called by underlying C code to signal we're running
     def zkc_set_running_and_notify!
       logger.debug { "#{self.class}##{__method__}" }

data/ext/zookeeper_base.rb

@@ -8,12 +8,13 @@ require 'forwardable'
 module Zookeeper
 class ZookeeperBase
   extend Forwardable
-  include Zookeeper::Forked
-  include Zookeeper::Common       # XXX: clean this up, no need to include *everything*
-  include Zookeeper::Callbacks
-  include Zookeeper::Constants
-  include Zookeeper::Exceptions
-  include Zookeeper::ACLs
+  include Forked
+  include Common       # XXX: clean this up, no need to include *everything*
+  include Callbacks
+  include Constants
+  include Exceptions
+  include ACLs
+  include Logger
 
   attr_accessor :original_pid
 
@@ -143,7 +144,8 @@ class ZookeeperBase
       raise Exceptions::NotConnected   unless connected?
       if forked?
         raise InheritedConnectionError, <<-EOS.gsub(/(?:^|\n)\s*/, ' ').strip
-          You tried to use a connection inherited from another process [#{@pid}]
+          You tried to use a connection inherited from another process 
+          (original pid: #{original_pid}, your pid: #{Process.pid})
           You need to call reopen() after forking
         EOS
       end

data/ext/zookeeper_lib.c

@@ -64,7 +64,7 @@ void atfork_child() {
 // set up handlers to make sure the thread being forked holds the lock at the 
 // time the process is copied, then immediately unlock the mutex in both parent
 // and children
-pthread_atfork(atfork_prepare, atfork_parent, atfork_child);
+/*pthread_atfork(atfork_prepare, atfork_parent, atfork_child);*/
 
 
 void zkrb_enqueue(zkrb_queue_t *q, zkrb_event_t *elt) {

data/java/java_base.rb

@@ -16,11 +16,12 @@ module Zookeeper
 # subclassed by the top-level Zookeeper class
 class JavaBase
   include Java
-  include Zookeeper::Common
-  include Zookeeper::Constants
-  include Zookeeper::Callbacks
-  include Zookeeper::Exceptions
-  include Zookeeper::ACLs
+  include Common
+  include Constants
+  include Callbacks
+  include Exceptions
+  include ACLs
+  include Logger
 
   JZK   = org.apache.zookeeper
   JZKD  = org.apache.zookeeper.data
@@ -64,16 +65,13 @@ class JavaBase
   # @private
   module JavaCB
     class Callback
+      include Logger
+
       attr_reader :req_id
 
       def initialize(req_id)
         @req_id = req_id
       end
-
-    protected
-      def logger
-        Zookeeper.logger
-      end
     end
 
     class DataCallback < Callback

data/lib/zookeeper.rb

@@ -15,6 +15,7 @@ silence_warnings do
   require 'backports'
 end
 
+require_relative 'zookeeper/logger'
 require_relative 'zookeeper/forked'
 require_relative 'zookeeper/latch'
 require_relative 'zookeeper/acls'
@@ -33,7 +34,7 @@ module Zookeeper
   include Constants
 
   unless defined?(@@logger)
-    @@logger = Logger.new($stderr).tap { |l| l.level = ENV['ZOOKEEPER_DEBUG'] ? Logger::DEBUG : Logger::ERROR } 
+    @@logger = ::Logger.new($stderr).tap { |l| l.level = ENV['ZOOKEEPER_DEBUG'] ? ::Logger::DEBUG : ::Logger::ERROR } 
   end
 
   def self.logger

data/lib/zookeeper/client_methods.rb

@@ -2,6 +2,7 @@ module Zookeeper
 module ClientMethods
   include Constants
   include ACLs
+  include Logger
 
   def reopen(timeout=10, watcher=nil)
     warn "WARN: ZookeeperBase#reopen watcher argument is now ignored" if watcher
@@ -208,10 +209,6 @@ protected
     super
   end
 
-  def logger
-    Zookeeper.logger
-  end
-
   def assert_valid_data_size!(data)
     return if data.nil?
 

data/lib/zookeeper/common/queue_with_pipe.rb

@@ -3,6 +3,7 @@ module Common
   # Ceci n'est pas une pipe
   class QueueWithPipe
     extend Forwardable
+    include Logger
 
     def_delegators :@queue, :clear
     
@@ -65,10 +66,6 @@ module Common
       def clear_reads_on_pop?
         @clear_reads_on_pop
       end
-
-      def logger
-        Zookeeper.logger
-      end
   end
 end
 end

data/lib/zookeeper/logger.rb

@@ -0,0 +1,22 @@
+module Zookeeper
+  module Logger
+    def self.included(mod)
+      mod.extend(self)
+    end
+
+    def self.const_missing(sym)
+      return ::Logger.const_get(sym) if ::Logger.const_defined?(sym)
+      super
+    end
+
+    def self.new(*a, &b)
+      ::Logger.new(*a, &b)
+    end
+
+    private
+      def logger
+        ::Zookeeper.logger
+      end
+  end
+end
+

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
   DRIVER_VERSION = '3.3.5'
 end

data/spec/ext/zookeeper_base_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+unless defined?(::JRUBY_VERSION)
+  describe Zookeeper::ZookeeperBase do
+    before do
+      @zk = described_class.new(Zookeeper.default_cnx_str)
+    end
+
+    after do
+      @zk.close unless @zk.closed?
+    end
+
+    it %[should have an original_pid assigned] do
+      @zk.original_pid.should == Process.pid
+    end
+  end
+end
+
+

data/spec/support/zookeeper_spec_helpers.rb

@@ -2,10 +2,7 @@ module Zookeeper
   module SpecHeleprs
     class TimeoutError < StandardError; end
     include Zookeeper::Constants
-
-    def logger
-      Zookeeper.logger
-    end
+    include Zookeeper::Logger
 
     def ensure_node(zk, path, data)
       return if zk.closed?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 Z
+date: 2012-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: backports
@@ -54,6 +54,7 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- .ctags_paths
 - .dotfiles/rvmrc
 - .gitignore
 - .gitmodules
@@ -95,6 +96,7 @@ files:
 - lib/zookeeper/exceptions.rb
 - lib/zookeeper/forked.rb
 - lib/zookeeper/latch.rb
+- lib/zookeeper/logger.rb
 - lib/zookeeper/rake_tasks.rb
 - lib/zookeeper/stat.rb
 - lib/zookeeper/version.rb
@@ -105,6 +107,7 @@ files:
 - spec/compatibilty_spec.rb
 - spec/default_watcher_spec.rb
 - spec/em_spec.rb
+- spec/ext/zookeeper_base_spec.rb
 - spec/fork_hook_specs.rb
 - spec/forked_connection_spec.rb
 - spec/latch_spec.rb
@@ -157,6 +160,7 @@ test_files:
 - spec/compatibilty_spec.rb
 - spec/default_watcher_spec.rb
 - spec/em_spec.rb
+- spec/ext/zookeeper_base_spec.rb
 - spec/fork_hook_specs.rb
 - spec/forked_connection_spec.rb
 - spec/latch_spec.rb