easymon 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 995c7954f5c5d720f9840c0f93b1d673de2e6a6682c7a134336cac6d21f2a280
-  data.tar.gz: 7cbce9feb1e3a4f4fc7c661a5597314fb2107e3ac36d5ee84cfa2810c218dc75
+  metadata.gz: 46eed6312dd05be2f1cc453b481dbbe26cbed28e6a9954d68aee4ed96b5d2935
+  data.tar.gz: 57a512d8baf55d331a7386ccc80ea9879820cb2775327d321ba8d11d0b630660
 SHA512:
-  metadata.gz: c805aec0b3a45ac5e289ffe5fe7f17e85abb250dbd31d09787e1e3912e11d4040a3a7aa9c04018fc8dfe4febc3e0aaeb638f4ef4e4a65eea8d0250d2fb60b090
-  data.tar.gz: 2763483c3faf6714ccfbc3ea055bb985a9ed0a125527e41ec9e72e25946a85979794590c6886fa42259c9e1fa6dbac99b441ac575ef89a3bfbebdf7c8d8372b0
+  metadata.gz: cfe6ee337e9353b08dd9dcb7b807f2f8881d471e884257fd8a21e48bf29f79fb6680ba29a56b2cea2b40ac365d46ca9566fa89c1df98808832e11bf93d45ee66
+  data.tar.gz: 13e4c388db907301c04ed04a3fe25b8eba77b78e88496d3b1ac1a993980fb65ecf75db24c91b1f90ad230b47ad4c70919b973b587280a7ec9bd95d6b09433291

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/version.rb

@@ -1,3 +1,3 @@
 module Easymon
-  VERSION = "1.4"
+  VERSION = "1.5"
 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/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