zookeeper 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.4.2 Add options to Zookeeper#initialize, silence most Zookeeper logs.
+
 v0.4.1 Upgrade to ZooKeeper 3.3.2
 
 v0.4.0. More attr-readers (StarvingMarvin) and 1.9 compatibility (tsuraan)

data/Manifest

@@ -1,6 +1,5 @@
 CHANGELOG
 LICENSE
-Manifest
 README
 Rakefile
 examples/cloud_config.rb
@@ -21,4 +20,4 @@ test/test_close.rb
 test/test_esoteric.rb
 test/test_watcher1.rb
 test/test_watcher2.rb
-zookeeper.gemspec
+Manifest

data/ext/zookeeper_c.c

@@ -55,9 +55,28 @@ static void print_zkrb_instance_data(struct zkrb_instance_data* ptr) {
   fprintf(stderr, "}\n");
 }
 
-static VALUE method_init(VALUE self, VALUE hostPort) {
+static VALUE method_init(int argc, VALUE* argv, VALUE self) {
+  VALUE hostPort;
+  VALUE options;
+  rb_scan_args(argc, argv, "11", &hostPort, &options);
+
+  if (NIL_P(options)) {
+    options = rb_hash_new();
+  } else {
+    Check_Type(options, T_HASH);
+  }
+
   Check_Type(hostPort, T_STRING);
 
+  // Look up :zkc_log_level
+  VALUE log_level = rb_hash_aref(options, ID2SYM(rb_intern("zkc_log_level")));
+  if (NIL_P(log_level)) {
+    zoo_set_debug_level(0); // no log messages
+  } else {
+    Check_Type(log_level, T_FIXNUM);
+    zoo_set_debug_level(log_level);
+  }
+
   VALUE data;
   struct zkrb_instance_data *zk_local_ctx = NULL;
   data = Data_Make_Struct(Zookeeper,
@@ -66,10 +85,9 @@ static VALUE method_init(VALUE self, VALUE hostPort) {
            free_zkrb_instance_data,
            zk_local_ctx);
   zk_local_ctx->queue = zkrb_queue_alloc();
-  
-  zoo_set_debug_level(ZOO_LOG_LEVEL_INFO);
+
   zoo_deterministic_conn_order(0);
-  
+
   zkrb_calling_context *ctx =
     zkrb_calling_context_alloc(ZKRB_GLOBAL_REQ, zk_local_ctx->queue);
 
@@ -440,7 +458,7 @@ static void zkrb_define_methods(void) {
 #define DEFINE_CLASS_METHOD(method, args) { \
     rb_define_singleton_method(Zookeeper, #method, method_ ## method, args); }
 
-  DEFINE_METHOD(init, 1);
+  DEFINE_METHOD(init, -1);
   DEFINE_METHOD(get_children, 4);
   DEFINE_METHOD(exists, 4);
   DEFINE_METHOD(create, 6);

data/zookeeper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zookeeper}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phillip Pearson, Eric Maland, Evan Weaver, Brian Wickman"]
-  s.date = %q{2010-12-14}
+  s.date = %q{2011-01-06}
   s.description = %q{An interface to the Zookeeper distributed configuration server.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Phillip Pearson, Eric Maland, Evan Weaver, Brian Wickman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: []