Merge pull request #333 from spiceworks/issue332

Add synchronization around use of @cluster and other variables Fix #332
cequel · Oct 18, 2016 · cfa015f · cfa015f
2 parents 4eb73e6 + 7e7d82a
commit cfa015f
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/lib/cequel/metal/keyspace.rb b/lib/cequel/metal/keyspace.rb
@@ -94,8 +94,8 @@ def self.sanitize(statement, bind_vars)
       # @see Cequel.connect
       #
       def initialize(configuration={})
-        configure(configuration)
         @lock = Monitor.new
+        configure(configuration)
       end
 
       #
@@ -241,15 +241,17 @@ def prepare_statement(statement)
       # @return [void]
       #
       def clear_active_connections!
-        if defined? @client
-          remove_instance_variable(:@client)
-        end
-        if defined? @client_without_keyspace
-          remove_instance_variable(:@client_without_keyspace)
-        end
-        if defined? @cluster
-          @cluster.close
-          remove_instance_variable(:@cluster)
+        synchronize do
+          if defined? @client
+            remove_instance_variable(:@client)
+          end
+          if defined? @client_without_keyspace
+            remove_instance_variable(:@client_without_keyspace)
+          end
+          if defined? @cluster
+            @cluster.close
+            remove_instance_variable(:@cluster)
+          end
         end
       end