easymon 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0da61c5a7884eff9b291047c2f62fb33522ed563f7354a96668382efee677e9
-  data.tar.gz: 6f4bd4639bbb7eb92a1704790b74dd7ad1a39e12bdb3eaaadfe9a09c80f92628
+  metadata.gz: 490608ebcb523864b151edb279f588666d28f9c4f7d8c82dd20ca78c693fa8b3
+  data.tar.gz: 0454747b69b860392618069eca04e8e6915b09d38b3b0ffc70e561a0a9d35b5c
 SHA512:
-  metadata.gz: 629e59c09ca919641f656fd57b70ca842e475b30be7ab5e0e257a2b0ddd10a827e64fd902b876fab28f54bed3d7e4f9518917bd95acbcb5e2ff8477a741c89bf
-  data.tar.gz: db6dddd3cc4aaf6397fad30c0314df8bdac3b98f534fa4a6713f66a953529dc301ef1f9d7f3dedc22d100caf32a472f40c46dca59a036f009a83194496e96374
+  metadata.gz: f74dd8bb8cf1bf24e94234e73a164f2deb1b5a0aa12e5b94ef05a157b50cbdc89cd3a5925b88c3c72879bbbcab3c40b0d50d45e120858489bce1a1ccffa757e5
+  data.tar.gz: 102eb2cd04c6158e3b568177925118b42cba506a676f6067943ac296977ea05d29ede3b55f6a03d5ae431a4c41354fca34784b161475400a8f0df3a590c618df

data/lib/easymon/checks/multi_active_record_check.rb

@@ -1,6 +1,7 @@
 module Easymon
   class MultiActiveRecordCheck
     attr_accessor :block
+    attr_accessor :query
     attr_accessor :results
 
     # Here we pass a block so we get a fresh instance of ActiveRecord::Base or
@@ -26,15 +27,36 @@ module Easymon
     #    }
     # }
     # Easymon::Repository.add("multi-database", check)
+    #
+    # Optionally, a health check query can be given instead of relying on
+    # connection.active?. The query is run against each connection and must
+    # return a single truthy/falsey value (e.g. 1/0 from MySQL):
+    # check = Easymon::MultiActiveRecordCheck.new(query: "SELECT @@read_only") {
+    #    { "Primary": ActiveRecord::Base.connection }
+    # }
+    #
+    # A per-connection query can also be given by pairing the connection with
+    # its query. It takes precedence over the default query: option above:
+    # check = Easymon::MultiActiveRecordCheck.new {
+    #    {
+    #      "Primary": [ActiveRecord::Base.connection, "SELECT @@read_only"],
+    #      "PrimaryReplica": [Easymon::PrimaryReplica.connection, "SELECT TIMESTAMPDIFF(MICROSECOND, MAX(ts), NOW(6)) / 1000000 < 1 FROM percona.heartbeat"],
+    #      "OtherReplica": Easymon::OtherReplica.connection # plain connection.active?
+    #    }
+    # }
 
-    def initialize(&block)
+    def initialize(query: nil, &block)
+      self.query = query
       self.block = block
     end
 
     def check
       connections = Hash(@block.call)
 
-      results = connections.transform_values { |connection| database_up?(connection) }
+      results = connections.transform_values do |value|
+        connection, connection_query = value.is_a?(Array) ? value : [ value, nil ]
+        database_up?(connection, query: connection_query || query)
+      end
 
       status = results.map { |db_name, result| "#{db_name}: #{result ? 'Up' : 'Down'}" }.join(" - ")
 
@@ -42,9 +64,13 @@ module Easymon
     end
 
     private
-      def database_up?(connection)
+      def database_up?(connection, query: nil)
         connection.connect!
-        connection.active?
+        if query
+          ActiveModel::Type::Boolean.new.cast(connection.select_value(query)) || false
+        else
+          connection.active?
+        end
       rescue
         false
       end

data/lib/easymon/version.rb

@@ -1,3 +1,3 @@
 module Easymon
-    VERSION = "1.6.5"
+    VERSION = "1.6.6"
 end