cassandra 0.11.2 → 0.11.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.11.3
+- Fix login after reconnect
+
 v0.11.2
 - Update thrift_client gem to deal with failover bug.
 

data/cassandra.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.11.2"
+  s.version = "0.11.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Evan Weaver, Ryan King}]
-  s.date = %q{2011-06-30}
+  s.date = %q{2011-07-05}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
   s.executables = [%q{cassandra_helper}]

data/lib/cassandra/cassandra.rb

@@ -116,9 +116,15 @@ class Cassandra
   # * password
   #
   def login!(username, password)
-    @auth_request = CassandraThrift::AuthenticationRequest.new
-    @auth_request.credentials = {'username' => username, 'password' => password}
-    client.login(@auth_request)
+    request = CassandraThrift::AuthenticationRequest.new
+    request.credentials = {'username' => username, 'password' => password}
+    ret = client.login(request)
+
+    # To avoid a double login on the initial connect, we set
+    # @auth_request after the first successful login.
+    #
+    @auth_request = request
+    ret
   end
 
   def inspect
@@ -1007,7 +1013,6 @@ class Cassandra
   def client
     if @client.nil? || @client.current_server.nil?
       reconnect!
-      @client.set_keyspace(@keyspace)
     end
     @client
   end
@@ -1015,6 +1020,13 @@ class Cassandra
   def reconnect!
     @servers = all_nodes
     @client = new_client
+    @client.add_callback :post_connect do |cli|
+      # Set the active keyspace after connecting
+      cli.set_keyspace(@keyspace)
+
+      # If using an authenticated keyspace, ensure we relogin
+      cli.login(@auth_request) if @auth_request
+    end
   end
 
   def all_nodes

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 11
-  - 2
-  version: 0.11.2
+  - 3
+  version: 0.11.3
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 Z
+date: 2011-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift_client