Merge 9767f66 into 803bbcd

lib/moped/node.rb

@@ -187,7 +187,11 @@ def ensure_connected(&block)
 
       begin
         connection do |conn|
-          connect(conn) unless conn.alive?
+          if conn.alive?
+            @down_at = nil
+          else
+            connect(conn)
+          end
           conn.apply_credentials(@credentials)
           stack(:connection) << conn
           yield(conn)

spec/moped/node_spec.rb

@@ -309,6 +309,21 @@
         end
       end
     end
+
+    context 'when node was down' do
+      before { node.down! }
+
+      context 'and good connection popped out of the pool' do
+        before { allow_any_instance_of(Moped::Connection).to receive(:alive?).and_return true }
+
+        it 'marks node as not down' do
+          node.ensure_connected do
+            node.command("admin", ping: 1)
+          end
+          expect(node).not_to be_down
+        end
+      end
+    end
   end
 
   describe "#initialize" do