easymon 1.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 995c7954f5c5d720f9840c0f93b1d673de2e6a6682c7a134336cac6d21f2a280
-  data.tar.gz: 7cbce9feb1e3a4f4fc7c661a5597314fb2107e3ac36d5ee84cfa2810c218dc75
+  metadata.gz: cb55744be4fa12e4c7af34ae59091721967aaf08d1bd07e4bc0cca4bd2937c4a
+  data.tar.gz: ed1822f256bea98b6982f634487c676fad7e292ca093c10315ce72990ffb6778
 SHA512:
-  metadata.gz: c805aec0b3a45ac5e289ffe5fe7f17e85abb250dbd31d09787e1e3912e11d4040a3a7aa9c04018fc8dfe4febc3e0aaeb638f4ef4e4a65eea8d0250d2fb60b090
-  data.tar.gz: 2763483c3faf6714ccfbc3ea055bb985a9ed0a125527e41ec9e72e25946a85979794590c6886fa42259c9e1fa6dbac99b441ac575ef89a3bfbebdf7c8d8372b0
+  metadata.gz: bd39994e506c00177688ae9ecb7ff660326cc44eec4374cdeb42873c3128bec45da18dfb54969b9a6494fb0d79ef1d87be4d223c4ef162a70bfc5d4db4345e9a
+  data.tar.gz: a6515ddbd1f7a0bce037815d8804c2c7689dfc943c1ad9c7f037d711ff41700efcc6367e261b2bd3a80b43590e30ef2523ec2bd639537aac7eada9fa5f000bbd

data/README.md

@@ -203,7 +203,7 @@ module Easymon
       end
     end
     def database_configuration
-      env = "#{Rails.env}_slave"
+      env = "#{Rails.env}_replica"
       config = YAML.load_file(Rails.root.join('config/database.yml'))[env]
     end
   end

data/app/controllers/easymon/checks_controller.rb

@@ -17,8 +17,8 @@ module Easymon
 
     rescue_from Easymon::NoSuchCheck do |e|
       respond_to do |format|
-        format.any(:text, :html) { render_result e.message, :not_found }
-        format.json { render :json => e.message, :status => :not_found }
+        format.any(:text, :html) { render_result "Check Not Found", :not_found }
+        format.json { render :json => "Check Not Found", :status => :not_found }
       end
     end
 

data/lib/easymon/checks/active_record_mysql_writeable_check.rb

@@ -0,0 +1,26 @@
+module Easymon
+  class ActiveRecordMysqlWriteableCheck
+    attr_accessor :klass
+
+    def initialize(klass)
+      self.klass = klass
+    end
+
+    def check
+      check_status = database_writeable?
+      if check_status
+        message = "@@read_only is 0"
+      else
+        message = "@@read_only is 1"
+      end
+      [check_status, message]
+    end
+
+    private
+      def database_writeable?
+        klass.connection.execute("SELECT @@read_only").entries.flatten.first == 0
+      rescue
+        false
+      end
+  end
+end

data/lib/easymon/checks/redis_check.rb

@@ -3,11 +3,11 @@ require "redis"
 module Easymon
   class RedisCheck
     attr_accessor :config
-    
+
     def initialize(config)
       self.config = config
-    end 
-    
+    end
+
     def check
       check_status = redis_up?
       if check_status
@@ -17,12 +17,16 @@ module Easymon
       end
       [check_status, message]
     end
-    
+
     private
       def redis_up?
         redis = Redis.new(@config)
         reply = redis.ping == 'PONG'
-        redis.close
+        if redis.respond_to? :close
+          redis.close              # Redis 4+
+        else
+          redis.client.disconnect  # Older redis
+        end
         reply
       rescue
         false

data/lib/easymon/checks/redis_writeable_check.rb

@@ -0,0 +1,36 @@
+require "redis"
+
+module Easymon
+  class RedisWriteableCheck
+    attr_accessor :config
+
+    def initialize(config)
+      self.config = config
+    end
+
+    def check
+      check_status = redis_writeable?
+      message = check_status ? "Writeable" : "Read Only"
+
+      [check_status, message]
+    end
+
+    private
+      def redis_writeable?
+        redis = Redis.new(@config)
+        key = "easymon_#{Time.now.to_i}"
+        reply = redis.set(key, "true")
+        redis.del(key)
+
+        reply == "OK"
+      rescue
+        false
+      ensure
+        if redis.respond_to? :close
+          redis.close              # Redis 4+
+        else
+          redis.client.disconnect  # Older redis
+        end
+      end
+  end
+end

data/lib/easymon/checks/split_active_record_check.rb

@@ -2,10 +2,10 @@ module Easymon
   class SplitActiveRecordCheck
     attr_accessor :block
     attr_accessor :results
-    
+
     # Here we pass a block so we get a fresh instance of ActiveRecord::Base or
     # whatever other class we might be using to make database connections
-    # 
+    #
     # For example, given the following other class:
     # module Easymon
     #   class Base < ActiveRecord::Base
@@ -18,12 +18,12 @@ module Easymon
     #     end
     #
     #     def database_configuration
-    #       env = "#{Rails.env}_slave"
+    #       env = "#{Rails.env}_replica"
     #       config = YAML.load_file(Rails.root.join('config/database.yml'))[env]
     #     end
     #   end
     # end
-    # 
+    #
     # We would check both it and ActiveRecord::Base like so:
     # check = Easymon::SplitActiveRecordCheck.new {
     #   [ActiveRecord::Base.connection, Easymon::Base.connection] 
@@ -31,20 +31,20 @@ module Easymon
     # Easymon::Repository.add("split-database", check)
     def initialize(&block)
       self.block = block
-    end 
-    
+    end
+
     # Assumes only 2 connections
     def check
       connections = Array(@block.call)
 
       results = connections.map{|connection| database_up?(connection) }
-      
-      master_status = results.first ? "Master: Up" : "Master: Down"
-      slave_status = results.last ? "Slave: Up" : "Slave: Down"
-      
-      [(results.all? && results.count > 0), "#{master_status} - #{slave_status}"]
+
+      primary_status = results.first ? "Primary: Up" : "Primary: Down"
+      replica_status = results.last ? "Replica: Up" : "Replica: Down"
+
+      [(results.all? && results.count > 0), "#{primary_status} - #{replica_status}"]
     end
-    
+
     private
       def database_up?(connection)
         connection.active?

data/lib/easymon/version.rb

@@ -1,3 +1,3 @@
 module Easymon
-  VERSION = "1.4"
+    VERSION = "1.6.0"
 end

data/lib/easymon.rb

@@ -8,8 +8,10 @@ require "easymon/repository"
 require "easymon/result"
 
 require "easymon/checks/active_record_check"
+require "easymon/checks/active_record_mysql_writeable_check"
 require "easymon/checks/split_active_record_check"
 require "easymon/checks/redis_check"
+require "easymon/checks/redis_writeable_check"
 require "easymon/checks/memcached_check"
 require "easymon/checks/semaphore_check"
 require "easymon/checks/traffic_enabled_check"

data/test/dummy/config/database.yml

@@ -17,10 +17,10 @@ test:
   host: 127.0.0.1
   port: 3306
 
-test_slave:
+test_replica:
   adapter: mysql2
   encoding: utf8
-  database: dummy_test_slave
+  database: dummy_test_replica
   username: root
   host: 127.0.0.1
   port: 3306

data/test/dummy/log/development.log

@@ -0,0 +1,24 @@
+   (0.3ms)  SET NAMES utf8,  @@SESSION.sql_mode = CONCAT(CONCAT(@@sql_mode, ',STRICT_ALL_TABLES'), ',NO_AUTO_VALUE_ON_ZERO'),  @@SESSION.sql_auto_is_null = 0, @@SESSION.wait_timeout = 2147483
+   (1.4ms)  CREATE DATABASE `dummy_development` DEFAULT CHARACTER SET `utf8`
+   (0.3ms)  SET NAMES utf8,  @@SESSION.sql_mode = CONCAT(CONCAT(@@sql_mode, ',STRICT_ALL_TABLES'), ',NO_AUTO_VALUE_ON_ZERO'),  @@SESSION.sql_auto_is_null = 0, @@SESSION.wait_timeout = 2147483
+   (1.0ms)  CREATE DATABASE `dummy_test` DEFAULT CHARACTER SET `utf8`
+   (0.3ms)  SET NAMES utf8,  @@SESSION.sql_mode = CONCAT(CONCAT(@@sql_mode, ',STRICT_ALL_TABLES'), ',NO_AUTO_VALUE_ON_ZERO'),  @@SESSION.sql_auto_is_null = 0, @@SESSION.wait_timeout = 2147483
+   (0.3ms)  SET NAMES utf8,  @@SESSION.sql_mode = CONCAT(CONCAT(@@sql_mode, ',STRICT_ALL_TABLES'), ',NO_AUTO_VALUE_ON_ZERO'),  @@SESSION.sql_auto_is_null = 0, @@SESSION.wait_timeout = 2147483
+   (25.9ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL PRIMARY KEY)
+   (20.9ms)  CREATE TABLE `ar_internal_metadata` (`key` varchar(255) NOT NULL PRIMARY KEY, `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL)
+   (0.1ms)  SELECT GET_LOCK('1721091371569202325', 0)
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` ORDER BY `schema_migrations`.`version` ASC
+  ActiveRecord::InternalMetadata Load (0.2ms)  SELECT  `ar_internal_metadata`.* FROM `ar_internal_metadata` WHERE `ar_internal_metadata`.`key` = 'environment' LIMIT 1
+   (0.1ms)  BEGIN
+  ActiveRecord::InternalMetadata Create (0.2ms)  INSERT INTO `ar_internal_metadata` (`key`, `value`, `created_at`, `updated_at`) VALUES ('environment', 'development', '2022-05-04 18:01:28', '2022-05-04 18:01:28')
+   (0.1ms)  COMMIT
+   (0.1ms)  SELECT RELEASE_LOCK('1721091371569202325')
+   (0.3ms)  SELECT @@read_only
+   (0.2ms)  SELECT @@read_only
+   (0.1ms)  SELECT @@read_only
+   (0.8ms)  SELECT @@read_only;
+   (0.9ms)  SELECT @@read_only;
+   (3.2ms)  SELECT @@read_only;
+   (0.2ms)  SELECT @@read_only
+   (0.2ms)  SELECT @@read_only;
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` ORDER BY `schema_migrations`.`version` ASC