zookeeper 1.3.0-java → 1.4.1-java

data/.travis.yml

@@ -10,6 +10,8 @@ before_install:
 env:
   - SPAWN_ZOOKEEPER='true'
 
+language: ruby
+
 rvm:
   - 1.9.3
   - 1.9.2
@@ -17,6 +19,12 @@ rvm:
   - ree
   - jruby-18mode
   - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
 
 bundler_args: --without development docs coverage
 

data/CHANGELOG

@@ -1,3 +1,16 @@
+v1.4.1 merge pull request 29 - fix exception handling in jruby 1.7.x
+
+  * h/t to @dynamix for the patch
+
+
+v1.4.0 Removed the 'logging' gem
+
+  * At the request of a user, use of the logging gem has been discontinued as
+    it appears to cause a fair amount of RSS memory bloating (8MB was
+    reported).  It's been replaced by a fairly simple ad-hoc implementation
+    using the stdlib 'logger' class. No user impact is expected unless you were
+    adjusting the Loggers on components of zookeeper.
+
 v1.3.0 much needed refactor of event and async result delivery
 
   * event and async blocks were previously mixed in with a bunch of other

data/Gemfile

@@ -5,11 +5,10 @@ gemspec
 gem 'rake', '~> 0.9.0'
 
 group :test do
-  gem "rspec", "~> 2.8.0"
-  gem 'eventmachine', '1.0.0.beta.4'
+  gem "rspec" , "~> 2.11"
+  gem 'eventmachine', '1.0.0'
   gem 'evented-spec', '~> 0.9.0'
-
-  gem 'zk-server', '~> 1.0.0'
+  gem 'zk-server', '~> 1.0'
 end
 
 # ffs, :platform appears to be COMLETELY BROKEN so we just DO THAT HERE

data/README.markdown

@@ -4,7 +4,7 @@
 
 An interface to the Zookeeper cluster coordination server.
 
-For a higher-level interface with a more convenient API and features such as locks, have a look at [ZK](https://github.com/slyphon/zk) (also available is [ZK-EventMachine](https://github.com/slyphon/zk-eventmachine) for those who prefer async).
+For a higher-level interface with a more convenient API and features such as locks, have a look at [ZK](https://github.com/slyphon/zk).
 
 ## Fork Safety! ##
 

data/java/java_base.rb

@@ -440,17 +440,26 @@ class JavaBase
       @mutex.synchronize { @jzk }
     end
 
-    def handle_keeper_exception
-      yield
-    rescue JZK::KeeperException => e
-      if e.respond_to?(:cause) and e.cause and e.cause.respond_to?(:code) and e.cause.code and e.cause.code.respond_to?(:intValue)
-        e.cause.code.intValue
-      else
-        raise e # dunno what happened, just raise it
+    # java exceptions are not wrapped anymore in JRuby 1.7+
+    if JRUBY_VERSION >= '1.7.0'
+      def handle_keeper_exception
+        yield
+      rescue JZK::KeeperException => e
+        # code is an enum and always set -> we don't need any additional checks here
+        e.code.intValue
+      end
+    else
+      def handle_keeper_exception
+        yield
+      rescue JZK::KeeperException => e
+        if e.respond_to?(:cause) and e.cause and e.cause.respond_to?(:code) and e.cause.code and e.cause.code.respond_to?(:intValue)
+          e.cause.code.intValue
+        else
+          raise e # dunno what happened, just raise it
+        end
       end
     end
 
-
     def call_type(callback, watcher)
       if callback
         watcher ? :async_watch : :async

data/lib/zookeeper.rb

@@ -5,7 +5,6 @@ require 'monitor'
 require 'forwardable'
 require 'logger'
 require 'benchmark'
-require 'logging'
 
 module Zookeeper
   ZOOKEEPER_ROOT = File.expand_path('../..', __FILE__)
@@ -33,6 +32,7 @@ Zookeeper.require_lib(
   'zookeeper/core_ext',
   'zookeeper/monitor',
   'zookeeper/logger',
+  'zookeeper/logger/forwarding_logger',
   'zookeeper/forked',
   'zookeeper/latch',
   'zookeeper/acls',

data/lib/zookeeper/client_methods.rb

@@ -165,7 +165,7 @@ module ClientMethods
     options[:callback] ? rv : rv.merge(:acl => acls, :stat => Stat.new(stat))
   end
 
-  # close this client and any underyling connections
+  # close this client and any underlying connections
   def close
     super
   end

data/lib/zookeeper/core_ext.rb

@@ -27,4 +27,32 @@ class ::Exception
   end
 end
 
+# this is borrowed from the excellent Logging gem: https://github.com/TwP/logging
+# @private
+class ::Module
+  # @private
+  # Returns a predictable logger name for the current module or class. If
+  # used within an anonymous class, the first non-anonymous class name will
+  # be used as the logger name. If used within a meta-class, the name of the
+  # actual class will be used as the logger name. If used within an
+  # anonymous module, the string 'anonymous' will be returned.
+  def _zk_logger_name
+    return name unless name.nil? or name.empty?
+
+    # check if this is a metaclass (or eigenclass)
+    if ancestors.include? Class
+      inspect =~ %r/#<Class:([^#>]+)>/
+      return $1
+    end
+
+    # see if we have a superclass
+    if respond_to? :superclass
+      return superclass.logger_name
+    end
+
+    # we are an anonymous module
+    return 'anonymous'
+  end
+end
+
 

data/lib/zookeeper/logger.rb

@@ -1,30 +1,29 @@
 module Zookeeper
   module Logger
-    def self.included(mod)
-      return false if mod < self    # avoid infinite recursion
-      mod.class_eval do 
-        def self.logger
-          ::Zookeeper.logger || ::Logging.logger[logger_name]
-        end
+    def self.wrapped_logger
+      if defined?(@@wrapped_logger)
+        @@wrapped_logger 
+      else
+        @@wrapped_logger = ::Logger.new(STDERR).tap { |l| l.level = ::Logger::FATAL }
       end
-      mod.extend(self)
     end
 
-    def self.set_default
-      ::Logging.logger['Zookeeper'].tap do |ch_root|
-        ::Logging.appenders.stderr.tap do |serr|
-          serr.layout = ::Logging.layouts.pattern(
-            :pattern => '%.1l, [%d] %c30.30{2}:  %m\n',
-            :date_pattern => '%Y-%m-%d %H:%M:%S.%6N' 
-          )
-
-          ch_root.add_appenders(serr)
-        end
+    def self.wrapped_logger=(log)
+      @@wrapped_logger = log
+    end
 
-        ch_root.level = ENV['ZOOKEEPER_DEBUG'] ? :debug : :off
+    # @private
+    module ClassMethods
+      def logger
+        ::Zookeeper.logger || ForwardingLogger.for(::Zookeeper::Logger.wrapped_logger, _zk_logger_name)
       end
     end
 
+    def self.included(base)
+      # return false if base < self    # avoid infinite recursion
+      base.extend(ClassMethods)
+    end
+
     private
       def log_realtime(what)
         logger.debug do
@@ -34,8 +33,7 @@ module Zookeeper
       end
 
       def logger
-        @logger ||= (::Zookeeper.logger || ::Logging.logger[self.class.logger_name]) # logger_name defined in ::Logging::Utils
+        @logger ||= (::Zookeeper.logger || self.class.logger)
       end
-  end
-end
-
+  end # Logger
+end # Zookeeper

data/lib/zookeeper/logger/forwarding_logger.rb

@@ -0,0 +1,84 @@
+module Zookeeper
+  module Logger
+    # h/t _eric and Papertrail
+    # @private
+    class ForwardingLogger
+      attr_accessor :level, :formatter
+
+      @@mutex = Monitor.new unless defined?(@@mutex)
+      @@loggers = {} unless defined?(@@loggers)
+
+      def self.for(logger, name)
+        @@mutex.synchronize do
+          @@loggers.fetch(name) do |k|
+            @@loggers[k] = new(logger, :formatter => lambda { |m| "%25.25s: #{m}" % name })
+          end
+        end
+      end
+
+      def initialize(logger, options = {})
+        @level     = ::Logger::DEBUG
+        @logger    = logger
+        @formatter = options[:formatter]
+      end
+
+      def add(severity, message = nil, progname = nil, &block)
+        severity ||= ::Logger::UNKNOWN
+        if !@logger || severity < @level
+          return true
+        end
+        
+        message = (message || (block && block.call) || progname).to_s
+        
+        if @formatter && @formatter.respond_to?(:call)
+          message = @formatter.call(message)
+        end
+
+        # If a newline is necessary then create a new message ending with a newline.
+        # Ensures that the original message is not mutated.
+        # message = "#{message}\n" unless message[-1] == ?\n
+        
+        @logger.add(severity, message)
+      end
+
+      def <<(msg); @logger << msg; end
+      def write(msg); @logger.write(msg); end
+      
+      def debug(progname = nil, &block)
+        add(::Logger::DEBUG, nil, progname, &block)
+      end
+      
+      def info(progname = nil, &block)
+        add(::Logger::INFO, nil, progname, &block)
+      end
+      
+      def warn(progname = nil, &block)
+        add(::Logger::WARN, nil, progname, &block)
+      end
+      
+      def error(progname = nil, &block)
+        add(::Logger::ERROR, nil, progname, &block)
+      end
+
+      def fatal(progname = nil, &block)
+        add(::Logger::FATAL, nil, progname, &block)
+      end
+
+      def unknown(progname = nil, &block)
+        add(::Logger::UNKNOWN, nil, progname, &block)
+      end
+      
+      def debug?; @level <= DEBUG; end
+
+      def info?; @level <= INFO; end
+
+      def warn?; @level <= WARN; end
+
+      def error?; @level <= ERROR; end
+
+      def fatal?; @level <= FATAL; end
+    end # ForwardingLogger
+  end # Logger
+end # Zookeeper
+
+

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.3.0'
+  VERSION = '1.4.1'
   DRIVER_VERSION = '3.3.5'
 end

data/spec/c_zookeeper_spec.rb

@@ -13,7 +13,7 @@ unless defined?(::JRUBY_VERSION)
       end
     end
 
-    def wait_until_connected(timeout=2)
+    def wait_until_connected(timeout=10)
       wait_until(timeout) { @czk.state == Zookeeper::Constants::ZOO_CONNECTED_STATE }
     end
 
@@ -38,7 +38,7 @@ unless defined?(::JRUBY_VERSION)
         end
 
         it %[should have a connection event after being connected] do
-          event = wait_until(2) { @event_queue.pop }
+          event = wait_until(10) { @event_queue.pop }
           event.should be
           event[:req_id].should == Zookeeper::Constants::ZKRB_GLOBAL_CB_REQ
           event[:type].should   == Zookeeper::Constants::ZOO_SESSION_EVENT

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ if ENV['ZKRB_DEBUG']
 end
 
 if ENV['ZKRB_NOLOG']
-  ::Logging.logger['Zookeeper'].level = :off
+  SpecGlobalLogger.logger.level = ::Logger::FATAL
   Zookeeper.set_debug_level(0)
 end
 
@@ -35,7 +35,7 @@ RSpec.configure do |config|
     require 'zk-server'
 
     config.before(:suite) do 
-      ::Logging.logger['spec'].debug { "Starting zookeeper service" }
+      SpecGlobalLogger.logger.debug { "Starting zookeeper service" }
       ZK::Server.run do |c|
         c.base_dir    = File.expand_path('../../.zkserver', __FILE__)
         c.client_port = Zookeeper.test_port
@@ -45,7 +45,7 @@ RSpec.configure do |config|
     end
 
     config.after(:suite) do
-      ::Logging.logger['spec'].debug { "stopping zookeeper service" }
+      SpecGlobalLogger.logger.debug  { "stopping zookeeper service" }
       ZK::Server.shutdown
     end
   end

data/spec/support/00_logging.rb

@@ -1,33 +1,34 @@
 module Zookeeper
   TEST_LOG_PATH = File.expand_path('../../../test.log', __FILE__)
-end
 
-layout = Logging.layouts.pattern(
-  :pattern => '%.1l, [%d #%p] %25.25c{2}:  %m\n',
-  :date_pattern => '%Y-%m-%d %H:%M:%S.%6N' 
-)
+  def self.setup_test_logger
+    log =
+      if (ENV['ZOOKEEPER_DEBUG'] || ENV['ZKRB_DEBUG'])
+        ::Logger.new(STDERR)
+      else
+        ::Logger.new(TEST_LOG_PATH)
+      end
 
-appender = (ENV['ZOOKEEPER_DEBUG'] || ENV['ZKRB_DEBUG']) ? Logging.appenders.stderr : Logging.appenders.file(Zookeeper::TEST_LOG_PATH)
-appender.layout = layout
-appender.auto_flushing = 25
-appender.flush_period = 5
+    log.level = ::Logger::DEBUG
 
-%w[spec Zookeeper].each do |name|
-  ::Logging.logger[name].tap do |log|
-    log.appenders = [appender]
-    log.level = :debug
+    Zookeeper::Logger.wrapped_logger = log
   end
 end
 
+Zookeeper.setup_test_logger
+
 module SpecGlobalLogger
+  extend self
+
   def logger
-    @spec_global_logger ||= ::Logging.logger['spec']
+    @spec_global_logger ||= Zookeeper::Logger::ForwardingLogger.for(Zookeeper::Logger.wrapped_logger, 'spec')
   end
 
   # sets the log level to FATAL for the duration of the block
   def mute_logger
-    zk_log = Logging.logger['Zookeeper']
-    orig_level, zk_log.level = zk_log.level, :off
+    zk_log = Zookeeper::Logger.wrapped_logger
+
+    orig_level, zk_log.level = zk_log.level, ::Logger::FATAL
     orig_zk_level, Zookeeper.debug_level = Zookeeper.debug_level, Zookeeper::Constants::ZOO_LOG_LEVEL_ERROR
     yield
   ensure

data/spec/support/progress_formatter.rb

@@ -5,7 +5,7 @@ module RSpec
     module Formatters
       class ProgressFormatter
         def example_started(example)
-          ::Logging.logger['spec'].write(yellow("\n=====<([ #{example.full_description} ])>=====\n"))
+          SpecGlobalLogger.logger << yellow("\n=====<([ #{example.full_description} ])>=====\n")
           super(example)
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 5
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 0
-  version: 1.3.0
+  - 4
+  - 1
+  version: 1.4.1
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,28 +20,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-17 00:00:00 Z
+date: 2012-12-17 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: logging
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 7
-        - 2
-        version: 1.7.2
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: slyphon-log4j
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -53,11 +37,11 @@ dependencies:
         - 15
         version: 1.2.15
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: slyphon-zookeeper_jar
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -69,7 +53,7 @@ dependencies:
         - 5
         version: 3.3.5
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 description: |+
   A low-level multi-Ruby wrapper around the ZooKeeper API bindings. For a
   friendlier interface, see http://github.com/slyphon/zk. Currently supported:
@@ -133,6 +117,7 @@ files:
 - lib/zookeeper/forked.rb
 - lib/zookeeper/latch.rb
 - lib/zookeeper/logger.rb
+- lib/zookeeper/logger/forwarding_logger.rb
 - lib/zookeeper/monitor.rb
 - lib/zookeeper/rake_tasks.rb
 - lib/zookeeper/request_registry.rb