Connection status check is protected when nil

eventide-project · Jan 18, 2019 · c707e7c · c707e7c
1 parent adbd711
commit c707e7c
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lib/message_store/postgres/session.rb b/lib/message_store/postgres/session.rb
@@ -69,7 +69,16 @@ def self.build_connection(instance)
       end
 
       def connected?
-        !connection.nil? && connection.status == PG::CONNECTION_OK
+        return false if connection.nil?
+
+        status = PG::CONNECTION_OK
+        begin
+          status = connection.status
+        rescue PG::ConnectionBad
+          status = nil
+        end
+
+        status == PG::CONNECTION_OK
       end
       alias :open? :connected?