zookeeper 0.3.0 → 0.3.2

data/CHANGELOG

@@ -1,5 +1,8 @@
+v0.3.2. Handle close, closed connections and expired sessions a little more gracefully.
 
-v0.3.0. Wickman's rewrite.
+v0.3.1. ACL bugfix.
+
+v0.3.0. Wickman's rewrite, breaks dependencies from myelin/emaland port.
 
 v0.2.2. Fix compatibility with stock Leopard fat-binary Ruby.
 

data/Manifest

@@ -1,9 +1,7 @@
 CHANGELOG
 LICENSE
-Manifest
 README
 Rakefile
-examples/cloud_config.rb
 ext/extconf.rb
 ext/zkc-3.3.1.tar.gz
 ext/zookeeper_c.c
@@ -15,8 +13,4 @@ lib/zookeeper/callbacks.rb
 lib/zookeeper/constants.rb
 lib/zookeeper/exceptions.rb
 lib/zookeeper/stat.rb
-test/test_basic.rb
-test/test_callback1.rb
-test/test_esoteric.rb
-test/test_watcher1.rb
-test/test_watcher2.rb
+Manifest

data/README

@@ -4,14 +4,10 @@ An interface to the Zookeeper distributed configuration server.
 
 == License
 
-<<<<<<< HEAD
-Copyright 2008 Phillip Pearson, and 2010 Twitter, Inc. Licensed under the MIT License. See the included LICENSE file. Portions copyright 2008-2010 the Apache Software Foundation, licensed under the Apache 2 license, and used with permission.
-=======
 Copyright 2008 Phillip Pearson, and 2010 Twitter, Inc. Licensed under the
 MIT License.  See the included LICENSE file.  Portions copyright 2008-2010
 the Apache Software Foundation, licensed under the Apache 2 license, and
 used with permission.
->>>>>>> wickman
 
 == Install
 
@@ -24,42 +20,6 @@ Connect to a server:
   require 'rubygems'
   require 'zookeeper'
   z = Zookeeper.new("localhost:2181")
-<<<<<<< HEAD
-
-Create, set and read nodes:
-
-  z.create("/bacon", "text to be stored in the new node", 0)
-  data, stat = z.get("/bacon")
-    # => ["text to be stored in the new node"...]
-  
-  z.set("/bacon", "an entirely different line of text", stat.version)
-  z.set("/bacon", "this won't work", stat.version)
-    # CZookeeper::BadVersionError: expected version does not match actual version
-
-  data, stat = z.get("/bacon")
-    # => ["an entirely different line of text"...]
-  z.delete("/bacon", stat.version)
-
-Create ephemeral and sequence nodes:
-
-  z.create("/parent", "parent node", 0)
-
-  z.create("/parent/test-", 
-    "an ordered ephemeral node", 
-    Zookeeper::EPHEMERAL | Zookeeper::SEQUENCE)
-    # => "/parent/test-0"
-
-  z.create("/parent/test-", 
-    "an ordered ephemeral node", 
-    Zookeeper::EPHEMERAL | Zookeeper::SEQUENCE)
-    # => "/parent/test-1"
-
-Acquire locks:
-
-  z.try_acquire "/parent/lock-", "content for the lock file" do |have_lock|
-    puts have_lock ? "we have the lock" : "we don't have the lock"
-  end
-=======
   z.get_children(:path => "/")
 
 == Idioms
@@ -80,4 +40,3 @@ Acquire locks:
   Calls take a dictionary of parameters.  With the exception of set_acl, the
   only required parameter is :path.  Each call returns a dictionary with at
   minimum two keys :req_id and :rc.
->>>>>>> wickman

data/ext/extconf.rb

@@ -33,7 +33,7 @@ Dir.chdir(HERE) do
     raise "'#{cmd}' failed" unless system(cmd)
 
     Dir.chdir(BUNDLE_PATH) do        
-      puts(cmd = "env CFLAGS='-fPIC #{$CFLAGS}' LDFLAGS='-fPIC #{$LDFLAGS}' ./configure --prefix=#{HERE} --without-cppunit --disable-shared --disable-dependency-tracking #{$EXTRA_CONF} 2>&1")
+      puts(cmd = "env CFLAGS='-fPIC #{$CFLAGS}' LDFLAGS='-fPIC #{$LDFLAGS}' ./configure --prefix=#{HERE} --without-cppunit --disable-dependency-tracking #{$EXTRA_CONF} 2>&1")
       raise "'#{cmd}' failed" unless system(cmd)
       puts(cmd = "make CXXFLAGS='#{$CXXFLAGS}' || true 2>&1")
       raise "'#{cmd}' failed" unless system(cmd)

data/ext/zookeeper_c.c

@@ -38,14 +38,24 @@ typedef enum {
 #define IS_ASYNC(zkrbcall) ((zkrbcall)==ASYNC || (zkrbcall)==ASYNC_WATCH)
 
 static void free_zkrb_instance_data(struct zkrb_instance_data* ptr) {
-#warning [wickman] TODO: free queue
 #warning [wickman] TODO: fire off warning if queue is not empty
   if (ptr->zh && zoo_state(ptr->zh) == ZOO_CONNECTED_STATE) {
     zookeeper_close(ptr->zh);
   }
+  if (ptr->queue) zkrb_queue_free(ptr->queue);
+  ptr->queue = NULL;
 }
 
-static VALUE method_initialize(VALUE self, VALUE hostPort) {
+static void print_zkrb_instance_data(struct zkrb_instance_data* ptr) {
+  fprintf(stderr, "zkrb_instance_data (%x) {\n", ptr);
+  fprintf(stderr, "   zh = %x\n",           ptr->zh);
+  fprintf(stderr, "     { state = %d }\n",  zoo_state(ptr->zh));
+  fprintf(stderr, "   id = %llx\n",         ptr->myid.client_id);
+  fprintf(stderr, "    q = %x\n",           ptr->queue);
+  fprintf(stderr, "}\n");
+}
+
+static VALUE method_init(VALUE self, VALUE hostPort) {
   Check_Type(hostPort, T_STRING);
 
   VALUE data;
@@ -96,11 +106,11 @@ static VALUE method_initialize(VALUE self, VALUE hostPort) {
   Data_Get_Struct(rb_iv_get(self, "@data"), struct zkrb_instance_data, zk); \
   zkrb_calling_context* cb_ctx =                                        \
     (async != Qfalse && async != Qnil) ?                                \
-       zkrb_calling_context_alloc(NUM2LL(reqid), zk->queue) :       \
+       zkrb_calling_context_alloc(NUM2LL(reqid), zk->queue) :           \
        NULL;                                                            \
   zkrb_calling_context* w_ctx =                                         \
     (watch != Qfalse && watch != Qnil) ?                                \
-       zkrb_calling_context_alloc(NUM2LL(reqid), zk->queue) :       \
+       zkrb_calling_context_alloc(NUM2LL(reqid), zk->queue) :           \
        NULL;                                                            \
   int a  = (async != Qfalse && async != Qnil);                          \
   int w  = (watch != Qfalse && watch != Qnil);                          \
@@ -234,7 +244,6 @@ static VALUE method_delete(VALUE self, VALUE reqid, VALUE path, VALUE version, V
   return INT2FIX(rc);
 }
 
-
 #define MAX_ZNODE_SIZE 1048576
 
 static VALUE method_get(VALUE self, VALUE reqid, VALUE path, VALUE async, VALUE watch) {
@@ -246,6 +255,7 @@ static VALUE method_get(VALUE self, VALUE reqid, VALUE path, VALUE async, VALUE
   struct Stat stat;
 
   int rc;
+  
   switch (call_type) {
     case SYNC:
       rc = zoo_get(zk->zh, RSTRING(path)->ptr, 0, data, &data_len, &stat);
@@ -271,6 +281,7 @@ static VALUE method_get(VALUE self, VALUE reqid, VALUE path, VALUE async, VALUE
     rb_ary_push(output, zkrb_stat_to_rarray(&stat));
   }
   free(data);
+
   return output;
 }
 
@@ -363,6 +374,7 @@ static VALUE method_get_acl(VALUE self, VALUE reqid, VALUE path, VALUE async) {
 
 static VALUE method_get_next_event(VALUE self) {
   FETCH_DATA_PTR(self, zk);
+  if (zk->queue == NULL) return Qnil;
   
   zkrb_event_t *event = zkrb_dequeue(zk->queue);
   if (event == NULL) return Qnil;
@@ -374,6 +386,7 @@ static VALUE method_get_next_event(VALUE self) {
 
 static VALUE method_has_events(VALUE self) {
   FETCH_DATA_PTR(self, zk);
+  if (zk->queue == NULL) return Qfalse;
   return zkrb_peek(zk->queue) != NULL ? Qtrue : Qfalse;
 }
 
@@ -427,7 +440,7 @@ static void zkrb_define_methods(void) {
 #define DEFINE_CLASS_METHOD(method, args) { \
     rb_define_singleton_method(Zookeeper, #method, method_ ## method, args); }
 
-  DEFINE_METHOD(initialize, 1);
+  DEFINE_METHOD(init, 1);
   DEFINE_METHOD(get_children, 4);
   DEFINE_METHOD(exists, 4);
   DEFINE_METHOD(create, 6);

data/ext/zookeeper_lib.c

@@ -55,6 +55,15 @@ zkrb_queue_t *zkrb_queue_alloc(void) {
   return rq;
 }
 
+void zkrb_queue_free(zkrb_queue_t *queue) {
+  if (queue == NULL) return;
+  zkrb_event_t *elt = NULL;
+  while ((elt = zkrb_dequeue(queue)) != NULL) {
+    zkrb_event_free(elt);
+  }
+  free(queue);
+}
+
 zkrb_event_t *zkrb_event_alloc(void) {
   zkrb_event_t *rv  = (zkrb_event_t *) malloc(sizeof(zkrb_event_t));
   return rv;
@@ -122,11 +131,11 @@ void zkrb_event_free(zkrb_event_t *event) {
    allocated on the proper thread stack */
 VALUE zkrb_event_to_ruby(zkrb_event_t *event) {
   VALUE hash = rb_hash_new();
-  
+
   rb_hash_aset(hash, GET_SYM("req_id"), LL2NUM(event->req_id));
   if (event->type != ZKRB_WATCHER)
     rb_hash_aset(hash, GET_SYM("rc"), INT2FIX(event->rc));
-  
+
   switch (event->type) {
     case ZKRB_DATA: {
       struct zkrb_data_completion *data_ctx = event->completion.data_completion;
@@ -435,6 +444,7 @@ struct Id zkrb_ruby_to_id(VALUE rubyid) {
   if (scheme != Qnil) {
     id.scheme = malloc(RSTRING(scheme)->len + 1);
     strncpy(id.scheme, RSTRING(scheme)->ptr, RSTRING(scheme)->len);
+    id.scheme[RSTRING(scheme)->len] = '\0';
   } else {
     id.scheme = NULL;
   }
@@ -442,6 +452,7 @@ struct Id zkrb_ruby_to_id(VALUE rubyid) {
   if (ident != Qnil) {
     id.id     = malloc(RSTRING(ident)->len + 1);
     strncpy(id.id, RSTRING(ident)->ptr, RSTRING(ident)->len);
+    id.id[RSTRING(ident)->len] = '\0';
   } else {
     id.id = NULL;
   }

data/ext/zookeeper_lib.h

@@ -87,10 +87,10 @@ typedef struct {
 } zkrb_queue_t;
 
 zkrb_queue_t * zkrb_queue_alloc(void);
+void           zkrb_queue_free(zkrb_queue_t *queue);
 zkrb_event_t * zkrb_event_alloc(void);
 void           zkrb_event_free(zkrb_event_t *ptr);
 
-
 /* push/pop is a misnomer, this is a queue */
 void                 zkrb_enqueue(zkrb_queue_t *queue, zkrb_event_t *elt);
 zkrb_event_t *       zkrb_peek(zkrb_queue_t *queue);

data/lib/zookeeper/callbacks.rb

@@ -12,7 +12,7 @@ module ZookeeperCallbacks
     end
     
     def call(*args)
-      puts "call passed #{args.inspect}"
+      # puts "call passed #{args.inspect}"
       @proc.call(*args)
     end
     

data/lib/zookeeper/exceptions.rb

@@ -52,6 +52,7 @@ module ZookeeperExceptions
     class Closing                 < ZookeeperException; end
     class Nothing                 < ZookeeperException; end
     class SessionMoved            < ZookeeperException; end
+    class ConnectionClosed        < ZookeeperException; end  # this is a Ruby client exception
     
     def self.by_code(code)
       case code

data/lib/zookeeper.rb

@@ -23,28 +23,33 @@ class Zookeeper < CZookeeper
   ZOO_LOG_LEVEL_INFO   = 3
   ZOO_LOG_LEVEL_DEBUG  = 4
   
-  def initialize(host, timeout = 10)
-    @watcher_reqs = { ZKRB_GLOBAL_CB_REQ => { :watcher => get_default_global_watcher } }
-    @completion_reqs = {}
-    @req_mutex = Mutex.new
-    @current_req_id = 1
-    super(host)
-    
+  def reopen(timeout = 10)
+    init(@host)
     if timeout > 0
       time_to_stop = Time.now + timeout
       until state == Zookeeper::ZOO_CONNECTED_STATE
         break if Time.now > time_to_stop
         sleep 0.1
       end
-
-      return nil if state != Zookeeper::ZOO_CONNECTED_STATE
     end
+    # flushes all outstanding watcher reqs.
+    @watcher_reqs = { ZKRB_GLOBAL_CB_REQ => { :watcher => get_default_global_watcher } }
+    state
+  end
 
+  def initialize(host, timeout = 10)
+    @watcher_reqs = {}
+    @completion_reqs = {}
+    @req_mutex = Mutex.new
+    @current_req_id = 1
+    @host = host
+    return nil if reopen(timeout) != Zookeeper::ZOO_CONNECTED_STATE
     setup_dispatch_thread!
   end
-  
-public  
+
+public
   def get(options = {})
+    assert_open
     assert_supported_keys(options, [:path, :watcher, :watcher_context, :callback, :callback_context])
     assert_required_keys(options, [:path])
     
@@ -56,6 +61,7 @@ public
   end
   
   def set(options = {})
+    assert_open
     assert_supported_keys(options, [:path, :data, :version, :callback, :callback_context])
     assert_required_keys(options, [:path])
     options[:version] ||= -1
@@ -68,6 +74,7 @@ public
   end
   
   def get_children(options = {})
+    assert_open
     assert_supported_keys(options, [:path, :callback, :callback_context, :watcher, :watcher_context])
     assert_required_keys(options, [:path])
 
@@ -79,6 +86,7 @@ public
   end
 
   def stat(options = {})
+    assert_open
     assert_supported_keys(options, [:path, :callback, :callback_context, :watcher, :watcher_context])
     assert_required_keys(options, [:path])
 
@@ -90,6 +98,7 @@ public
   end
   
   def create(options = {})
+    assert_open
     assert_supported_keys(options, [:path, :data, :acl, :ephemeral, :sequence, :callback, :callback_context])
     assert_required_keys(options, [:path])
     
@@ -107,6 +116,7 @@ public
   end
   
   def delete(options = {})
+    assert_open
     assert_supported_keys(options, [:path, :version, :callback, :callback_context])
     assert_required_keys(options, [:path])
     options[:version] ||= -1
@@ -118,6 +128,7 @@ public
   end
 
   def set_acl(options = {})
+    assert_open
     assert_supported_keys(options, [:path, :acl, :version, :callback, :callback_context])
     assert_required_keys(options, [:path, :acl])
     options[:version] ||= -1
@@ -129,6 +140,7 @@ public
   end
   
   def get_acl(options = {})
+    assert_open
     assert_supported_keys(options, [:path, :callback, :callback_context])
     assert_required_keys(options, [:path])
     
@@ -166,7 +178,7 @@ private
     if callback.respond_to?(:call)
       callback.call(hash)
     else
-      puts "dispatch_next_callback found non-callback => #{callback.inspect}"
+      # puts "dispatch_next_callback found non-callback => #{callback.inspect}"
     end
   end
   
@@ -211,12 +223,23 @@ public
   end
 
 private
+  # TODO: Make all global puts configurable
   def get_default_global_watcher
     Proc.new { |args|
-      puts "Ruby ZK Global CB called type=#{event_by_value(args[:type])} state=#{state_by_value(args[:state])}"
+      # puts "Ruby ZK Global CB called type=#{event_by_value(args[:type])} state=#{state_by_value(args[:state])}"
+      true
     }
   end
 
+  # if either of these happen, the user will need to renegotiate a connection via reopen
+  def assert_open
+    if state == ZOO_EXPIRED_SESSION_STATE
+      raise ZookeeperException::SessionExpired
+    elsif state != Zookeeper::ZOO_CONNECTED_STATE
+      raise ZookeeperException::ConnectionClosed
+    end
+  end
+
   def assert_supported_keys(args, supported)
     unless (args.keys - supported).empty?
       raise ZookeeperException::BadArguments,

data/test/test_close.rb

@@ -0,0 +1,16 @@
+require 'rubygems'
+require 'zookeeper'
+z = Zookeeper.new("localhost:2181")
+path = "/testing_node"
+z.get(:path => path)
+z.create(:path => path, :data => "initial value", :ephemeral => true)
+z.get(:path => path)
+z.close()
+sleep 5
+begin
+  z.get(:path => path)
+rescue Exception => e
+  puts "Rescued exception #{e.inspect}"
+end
+z.reopen
+z.get(:path => path)

data/zookeeper.gemspec

@@ -2,31 +2,29 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zookeeper}
-  s.version = "0.3.0"
+  s.version = "0.3.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.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2010-07-03}
+  s.date = %q{2010-08-17}
   s.description = %q{An interface to the Zookeeper distributed configuration server.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "ext/zookeeper_c.c", "lib/zookeeper.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "examples/cloud_config.rb", "ext/extconf.rb", "ext/zkc-3.3.1.tar.gz", "ext/zookeeper_c.c", "ext/zookeeper_lib.c", "ext/zookeeper_lib.h", "lib/zookeeper.rb", "lib/zookeeper/acls.rb", "lib/zookeeper/callbacks.rb", "lib/zookeeper/constants.rb", "lib/zookeeper/exceptions.rb", "lib/zookeeper/stat.rb", "test/test_basic.rb", "test/test_callback1.rb", "test/test_esoteric.rb", "test/test_watcher1.rb", "test/test_watcher2.rb", "zookeeper.gemspec"]
+  s.files = ["CHANGELOG", "LICENSE", "README", "Rakefile", "ext/extconf.rb", "ext/zkc-3.3.1.tar.gz", "ext/zookeeper_c.c", "ext/zookeeper_lib.c", "ext/zookeeper_lib.h", "lib/zookeeper.rb", "lib/zookeeper/acls.rb", "lib/zookeeper/callbacks.rb", "lib/zookeeper/constants.rb", "lib/zookeeper/exceptions.rb", "lib/zookeeper/stat.rb", "Manifest", "zookeeper.gemspec", "test/test_basic.rb", "test/test_callback1.rb", "test/test_close.rb", "test/test_esoteric.rb", "test/test_watcher1.rb", "test/test_watcher2.rb"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/zookeeper/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Zookeeper", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.6}
-  s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{An interface to the Zookeeper distributed configuration server.}
-  s.test_files = ["test/test_basic.rb", "test/test_callback1.rb", "test/test_esoteric.rb", "test/test_watcher1.rb", "test/test_watcher2.rb"]
+  s.test_files = ["test/test_basic.rb", "test/test_callback1.rb", "test/test_close.rb", "test/test_esoteric.rb", "test/test_watcher1.rb", "test/test_watcher2.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -1,41 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Phillip Pearson, Eric Maland, Evan Weaver, Brian Wickman
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARldmFu
-  MRgwFgYKCZImiZPyLGQBGRYIY2xvdWRidXIxEjAQBgoJkiaJk/IsZAEZFgJzdDAe
-  Fw0wNzA5MTYxMDMzMDBaFw0wODA5MTUxMDMzMDBaMD0xDTALBgNVBAMMBGV2YW4x
-  GDAWBgoJkiaJk/IsZAEZFghjbG91ZGJ1cjESMBAGCgmSJomT8ixkARkWAnN0MIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5C0Io89nyApnr+PvbNFge9Vs
-  yRWAlGBUEMahpXp28VrrfXZT0rAW7JBo4PlCE3jl4nE4dzE6gAdItSycjTosrw7A
-  Ir5+xoyl4Vb35adv56TIQQXvNz+BzlqnkAY5JN0CSBRTQb6mxS3hFyD/h4qgDosj
-  R2RFVzHqSxCS8xq4Ny8uzOwOi+Xyu4w67fI5JvnPvMxqrlR1eaIQHmxnf76RzC46
-  QO5QhufjAYGGXd960XzbQsQyTDUYJzrvT7AdOfiyZzKQykKt8dEpDn+QPjFTnGnT
-  QmgJBX5WJN0lHF2l1sbv3gh4Kn1tZu+kTUqeXY6ShAoDTyvZRiFqQdwh8w2lTQID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU+WqJz3xQ
-  XSea1hRvvHWcIMgeeC4wDQYJKoZIhvcNAQEFBQADggEBAGLZ75jfOEW8Nsl26CTt
-  JFrWxQTcQT/UljeefVE3xYr7lc9oQjbqO3FOyued3qW7TaNEtZfSHoYeUSMYbpw1
-  XAwocIPuSRFDGM4B+hgQGVDx8PMGiJKom4qLXjO40UZsR7QyN/u869Vj45LURm6h
-  MBcPeqCASI+WNprj9+uZa2kmHiitrFqqfMBNlm5IFbn9XeYSta9AHVvs5QQqV2m5
-  hIPfLqCyxsn/YgOGvo6iwyQTWyTswamaAC3HRWZxIS1sfn/Ssqa7E7oQMkv5FAXr
-  x5rKePfXINf8XTJczkl9OBEYdE9aNdJsJpXD0asLgGVwBICS5Bjohp6mizJcDC1+
-  yZ0=
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2010-07-03 00:00:00 -07:00
+date: 2010-08-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -54,10 +34,8 @@ extra_rdoc_files:
 files: 
 - CHANGELOG
 - LICENSE
-- Manifest
 - README
 - Rakefile
-- examples/cloud_config.rb
 - ext/extconf.rb
 - ext/zkc-3.3.1.tar.gz
 - ext/zookeeper_c.c
@@ -69,12 +47,14 @@ files:
 - lib/zookeeper/constants.rb
 - lib/zookeeper/exceptions.rb
 - lib/zookeeper/stat.rb
+- Manifest
+- zookeeper.gemspec
 - test/test_basic.rb
 - test/test_callback1.rb
+- test/test_close.rb
 - test/test_esoteric.rb
 - test/test_watcher1.rb
 - test/test_watcher2.rb
-- zookeeper.gemspec
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/zookeeper/
 licenses: []
@@ -91,16 +71,20 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -108,13 +92,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An interface to the Zookeeper distributed configuration server.
 test_files: 
 - test/test_basic.rb
 - test/test_callback1.rb
+- test/test_close.rb
 - test/test_esoteric.rb
 - test/test_watcher1.rb
 - test/test_watcher2.rb

data/examples/cloud_config.rb

@@ -1,125 +0,0 @@
-require "rubygems"
-require "zookeeper"
-
-# A basic cloud-based YAML config library.  Ruby Zookeeper client example.
-#
-# If you pass in a file as 'zk:/foo.yml/blah' it will go out to zookeeper. 
-# Otherwise the file is assumed to be local.  The yml file will get parsed
-# and cached locally, and keys after the .yml get interpreted as keys into
-# the YAML.
-#
-# e.g. get(zk:/config/service.yml/key1/key2/key3..) => 
-#   zk.get(:path => /config/service.yml)
-#   yaml <= YAML.parse(data)
-#   yaml[key1][key2][key3]...
-#
-# If keys are unspecified, it returns the parsed YAML as one big object
-#
-# TODO if staleness is set to 0, read in YAML immediately before next
-# get(...)
-
-class CloudConfig
-  class NodeNotFound < StandardError; end
-  class BadPathError < StandardError; end
-
-  DEFAULT_SERVERS = "localhost:2181"
-
-  def initialize(zkservers = DEFAULT_SERVERS, staleness = 15)  # maximum allowed staleness in seconds
-    @staleness = staleness
-    @lock      = Mutex.new
-    @zkservers = DEFAULT_SERVERS
-    
-    # cache
-    @data      = {}
-    @zkcb      = Zookeeper::WatcherCallback.new { dirty_callback(@zkcb.context) }
-    @zk        = nil
-  end
-
-  def get(node)
-    filename, keys = extract_filename(node)
-
-    # read(filename) is potentially a zk call, so do not hold the lock during the read
-    if @lock.synchronize { !@data.has_key?(filename) }
-      d = YAML.load(read(filename))
-      @lock.synchronize { @data[filename] = d }
-    end
-    
-    # synchronized b/c we potentially have a background thread updating data nodes from zk
-    # if keys is empty, return the whole file, otherwise roll up the keys
-    @lock.synchronize {
-      keys.empty? ? @data[filename] : keys.inject(@data[filename]) { |hash, key| hash[key] }
-    }
-  end
-
-  # todo:
-  #   factor get-and-watch into a different subsystem (so you can have
-  #   polling stat() ops on local filesystem.)
-  def read(yaml)
-    # read yaml file and register watcher.  if watcher fires, set up
-    # background thread to do read and update data.
-    if yaml.match(/^zk:/)
-      @zk ||= init_zk
-      yaml = yaml['zk:'.length..-1] # strip off zk: from zk:/config/path.yml
-      resp = get_and_register(yaml)
-
-      if resp[:rc] != Zookeeper::ZOK
-        @zk.unregister_watcher(resp[:req_id])
-        raise NodeNotFound
-      end
-      
-      resp[:data]
-    else
-      raise NodeNotFound unless File.exists?(yaml)
-      File.read(yaml)
-    end
-  end
-
-  def extract_filename(node)
-    path_elements = node.split("/")
-    
-    yamlindex = path_elements.map{ |x| x.match("\.yml$") != nil }.index(true)
-    raise BadPathError unless yamlindex
-    
-    yamlname = path_elements[0..yamlindex].join '/'
-    yamlkeys = path_elements[(yamlindex+1)..-1]
-    
-    return yamlname, yamlkeys
-  end
-    
- private
-  def init_zk
-    Zookeeper.new(@zkservers)
-  end
-  
-  def get_and_register(znode)
-    @zk.get(:path => znode, :watcher => @zkcb,
-                   :watcher_context => { :path => znode,
-                                         :wait => rand(@staleness) })
-  end
-  
-  def dirty_callback(context)
-    path = context[:path]
-    wait = context[:wait]
-
-    # Fire off a background update that waits a randomized period of time up
-    # to @staleness seconds.
-    Thread.new do
-      sleep wait
-      background_update(path)
-    end
-  end
-
-  def background_update(zkpath)
-    # do a synchronous get/register a new watcher
-    resp = get_and_register(zkpath)
-    if resp[:rc] != Zookeeper::ZOK
-      # puts "Unable to read #{zkpath} from Zookeeper!"  @logger.error
-      zk.unregister_watcher(resp[:req_id])
-    else
-      # puts "Updating data."
-      d = YAML.load(resp[:data])
-      @lock.synchronize { @data["zk:#{zkpath}"] = d }
-    end
-  end
-end
-