bleib 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4179c2fc5fecac31c6e9a78def4cc26732055829dab659d6228c47fd942b8bd
-  data.tar.gz: 3f9651be9c35735ad1f41cf068610b44e94433ae65989c277eb0c61471de9538
+  metadata.gz: f0026c9589d77a8763ca098abe295bfbe5bffde917753aab9a32c2743648cab3
+  data.tar.gz: 79a70f7065aa9e5a34a941eb371275c5c442f1a46f27d6e1c4d67c2beab83c3f
 SHA512:
-  metadata.gz: e04ab8ca2f1d598dcad1ec87c9c52845bcec3e415a936cd4d47b380be948dcce4a804e15c39335d8db934637b547ae63906ca36c9defbcfe571dbbfcbf70dc5b
-  data.tar.gz: b6ffd596ca831e4939aad7b2da4304e25f62a595e3497fb75b09784893b4286f0aba2e9aa94c845d25dc8e88a2a7039778c84ab88c548b2a2679ec97015e5ba6
+  metadata.gz: 5cf13688c65d9cbc2a88255c00029fdbf67febd13b6a07888954f95ed87db11a52a8712fc369434926d7c3a455235418f92762d627fde845408e660672a8dbeb
+  data.tar.gz: 221c1440dcc7249edcf5de75734a53f4a8165aafbdc3b9cd08eb41a5a9dff268ac2417b60f95226b9668c0568e476d730157c3ca9aa396ee7b85b0a75ce3536c

data/lib/bleib/configuration.rb

@@ -9,7 +9,7 @@ module Bleib
     DEFAULT_CHECK_MIGRATIONS_INTERVAL = 5 # Seconds
     DEFAULT_DATABASE_YML_PATH = 'config/database'
 
-    SUPPORTED_ADAPTERS = %w(postgresql postgis)
+    SUPPORTED_ADAPTERS = %w(postgresql postgis mysql2)
 
     def self.from_environment
       check_database_interval = interval_or_default(

data/lib/bleib/database.rb

@@ -40,26 +40,38 @@ module Bleib
       logger.debug('Database check succeeded')
 
       false
-    rescue PG::ConnectionBad => e
-      # On stopped database:
-      #   PG::ConnectionBad: could not connect to server: Connection refused
-      #   Is the server running on host "127.0.0.1" and accepting
-      #   TCP/IP connections on port 5432?
-      # On wrong/missing user:
-      #   PG::ConnectionBad: FATAL:  password authentication failed for user "wrong"
-      # On wrong password:
-      #   PG::ConnectionBad: FATAL:  password authentication failed for user "user"
+    rescue Exception => e
+      raise e unless database_down_exception?(e)
 
       logger.debug("Database check failed: #{e}")
-
       true
-    rescue ActiveRecord::NoDatabaseError
-      # On missing database:
-      #   ActiveRecord::NoDatabaseError: FATAL:  database "wrong" does not exist
-
-      logger.debug("Database check failed: #{e}")
+    end
 
-      true
+    def database_down_exception?(exception)
+      # Matching by class name because only constants defined by
+      # the used database adapter will be loaded.
+      case exception.class.name
+      when 'PG::ConnectionBad'
+        # On stopped database:
+        #   PG::ConnectionBad: could not connect to server: Connection refused
+        #   Is the server running on host "127.0.0.1" and accepting
+        #   TCP/IP connections on port 5432?
+        # On wrong/missing user/password:
+        #   PG::ConnectionBad: FATAL:  password authentication failed for user "wrong"
+        true
+      when 'Mysql2::Error'
+        # On stopped database:
+        #   Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (2)
+        # On wrong/missing user/password:
+        #   Access denied for user 'sraeze'@'localhost' (using password: YES)
+        true
+      when 'ActiveRecord::NoDatabaseError'
+        # On missing database:
+        #   ActiveRecord::NoDatabaseError: FATAL:  database "wrong" does not exist
+        true
+      else
+        false
+      end
     end
 
     def remove_connection

data/lib/bleib/version.rb

@@ -1,3 +1,3 @@
 module Bleib
-  VERSION = '0.0.8'.freeze
+  VERSION = '0.0.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bleib
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Puzzle ITC