easymon 1.5 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46eed6312dd05be2f1cc453b481dbbe26cbed28e6a9954d68aee4ed96b5d2935
-  data.tar.gz: 57a512d8baf55d331a7386ccc80ea9879820cb2775327d321ba8d11d0b630660
+  metadata.gz: 86b570ebd2a55ff6dcf7757d7c579d63ccf3dd47142892496190896acdec5b7d
+  data.tar.gz: 7afc1c23c22405e8912021ef88c28eb3c8c8969497e0557e35c7f41319361282
 SHA512:
-  metadata.gz: cfe6ee337e9353b08dd9dcb7b807f2f8881d471e884257fd8a21e48bf29f79fb6680ba29a56b2cea2b40ac365d46ca9566fa89c1df98808832e11bf93d45ee66
-  data.tar.gz: 13e4c388db907301c04ed04a3fe25b8eba77b78e88496d3b1ac1a993980fb65ecf75db24c91b1f90ad230b47ad4c70919b973b587280a7ec9bd95d6b09433291
+  metadata.gz: 44168748e184ef6ec72532156b8ffd730ea384063ae8e342afa70ae314d656febb6c87e35390190d2e690713d19edcb970be1df8af1285c572db67409f435729
+  data.tar.gz: e0024e1e2acf5b2de4affc4cf84d04f3c8c4bf69a6750f27ea4738d6579e11039618639a378fc38d609f9bc6d37ec03897d86f2877be4c9e4a7bbd41fd4336e6

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/lib/easymon/checks/active_record_mysql_writeable_check.rb

@@ -4,6 +4,7 @@ module Easymon
 
     def initialize(klass)
       self.klass = klass
+      @query = "SELECT @@read_only for UPDATE"
     end
 
     def check
@@ -18,7 +19,7 @@ module Easymon
 
     private
       def database_writeable?
-        klass.connection.execute("SELECT @@read_only").entries.flatten.first == 0
+        klass.connection.execute(@query).to_enum.first.first.to_i == 0
       rescue
         false
       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.5"
+    VERSION = "1.6.2"
 end

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/test.log

@@ -8371,3 +8371,546 @@ ActiveRecordMysqlWriteableCheckTest: test_#check_returns_a_successful_result_on_
   TRANSACTION (0.2ms)  ROLLBACK
   TRANSACTION (0.5ms)  ROLLBACK
   TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.2ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+---------------------------------------------------------------------------------
+SplitActiveRecordCheckTest: test_#run_sets_failed_conditions_when_primary_is_down
+---------------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+---------------------------------------------------------------------------------
+SplitActiveRecordCheckTest: test_#run_sets_failed_conditions_when_replica_is_down
+---------------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.4ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-------------------------------------------------------------------------------
+SplitActiveRecordCheckTest: test_#run_sets_success_conditions_on_successful_run
+-------------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------------------
+SplitActiveRecordCheckTest: test_given_nil_as_a_config
+------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+----------------------------------------------------------------------------------------
+ActiveRecordMysqlWriteableCheckTest: test_#check_returns_a_failed_result_on_a_failed_run
+----------------------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.2ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------
+ActiveRecordMysqlWriteableCheckTest: test_#check_returns_a_successful_result_on_a_good_run
+------------------------------------------------------------------------------------------
+   (0.1ms)  SELECT @@read_only for UPDATE
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+--------------------------------------------------------------------------
+RepositoryTest: test_adds_checks_marked_critical_to_the_critical_checklist
+--------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+--------------------------------------------
+RepositoryTest: test_fetches_a_check_by_name
+--------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-----------------------------------------------------
+RepositoryTest: test_fetches_a_critical_check_by_name
+-----------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+---------------------------------------------------
+RepositoryTest: test_returns_a_checklist_when_asked
+---------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (1.2ms)  ROLLBACK
+  TRANSACTION (0.7ms)  ROLLBACK
+  TRANSACTION (0.2ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+---------------------------------------------------------
+RepositoryTest: test_we_can_add_a_check_to_the_repository
+---------------------------------------------------------
+  TRANSACTION (0.4ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+--------------------------------------------------------------
+RepositoryTest: test_we_can_remove_a_check_from_the_repository
+--------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+----------------------------------------------------------------
+HttpCheckTest: test_#run_sets_failure_conditions_on_a_failed_run
+----------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------------------------------
+HttpCheckTest: test_#run_sets_failure_conditions_on_an_errored_run
+------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.2ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------------------------------
+HttpCheckTest: test_#run_sets_success_conditions_on_successful_run
+------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.6ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+--------------------------------------
+HttpCheckTest: test_given_nil_as_a_url
+--------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+--------------------------------------------------------------------------
+RedisWriteableCheckTest: test_#run_sets_failure_conditions_on_a_failed_run
+--------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+----------------------------------------------------------------------------
+RedisWriteableCheckTest: test_#run_sets_success_conditions_on_successful_run
+----------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.3ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+---------------------------------------------------------------------
+ChecklistTest: test_#response_status_returns_:ok_when_all_checks_pass
+---------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------------------------------------------------
+ChecklistTest: test_#response_status_returns_:service_unavailable_when_a_check_fails
+------------------------------------------------------------------------------------
+Dalli::Server#connect 127.0.0.1:11211
+127.0.0.1:11211 failed (count: 0) Errno::ECONNREFUSED: Connection refused - connect(2) for "127.0.0.1" port 11211
+Dalli::Server#connect 127.0.0.1:11211
+127.0.0.1:11211 failed (count: 1) Errno::ECONNREFUSED: Connection refused - connect(2) for "127.0.0.1" port 11211
+127.0.0.1:11211 is down
+  TRANSACTION (0.2ms)  ROLLBACK
+  TRANSACTION (0.2ms)  ROLLBACK
+  TRANSACTION (0.2ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-----------------------------------------------------------------
+ChecklistTest: test_#success?_returns_false_when_results_is_empty
+-----------------------------------------------------------------
+  TRANSACTION (0.2ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+---------------------------------------------------------
+ChecklistTest: test_#timing_is_a_sum_of_all_check_results
+---------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-------------------------------------------------------------------------
+ChecklistTest: test_#to_s_returns_a_valid_representation_of_the_checklist
+-------------------------------------------------------------------------
+  TRANSACTION (0.9ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.2ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.4ms)  BEGIN
+----------------------------------------------
+ChecklistTest: test_can_look_up_checks_by_name
+----------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.3ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+---------------------------------------------
+ChecklistTest: test_cat_fetch_a_check_by_name
+---------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.2ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-------------------------------------------------------------------
+ChecklistTest: test_it_knows_the_number_of_checks_in_the_Repository
+-------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------
+ChecklistTest: test_it_will_run_each_check
+------------------------------------------
+down_retry_delay not reached for 127.0.0.1:11211 (59.988 seconds left)
+down_retry_delay not reached for 127.0.0.1:11211 (59.988 seconds left)
+  TRANSACTION (0.2ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-----------------------------------------------------------------
+RedisCheckTest: test_#run_sets_failure_conditions_on_a_failed_run
+-----------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-------------------------------------------------------------------
+RedisCheckTest: test_#run_sets_success_conditions_on_successful_run
+-------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.2ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------
+RedisCheckTest: test_given_nil_as_a_config
+------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+----------------------------------------------------------------------------
+TrafficEnabledCheckTest: test_#check_sets_failure_conditions_on_a_failed_run
+----------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------------------------------------------
+TrafficEnabledCheckTest: test_#check_sets_success_conditions_on_successful_run
+------------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+---------------------------------------------------------------------
+MemcachedCheckTest: test_#run_sets_failure_conditions_on_a_failed_run
+---------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-----------------------------------------------------------------------
+MemcachedCheckTest: test_#run_sets_success_conditions_on_successful_run
+-----------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------------------------------
+MemcachedCheckTest: test_fails_when_passed_a_cache_with_no_servers
+------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+---------------------------------------------------------
+MemcachedCheckTest: test_fails_when_passed_nil_as_a_cache
+---------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+--------------------------------------------------------------------------------------
+ActiveRecordCheckOnPostgresqlTest: test_#check_returns_a_failed_result_on_a_failed_run
+--------------------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+----------------------------------------------------------------------------------------
+ActiveRecordCheckOnPostgresqlTest: test_#check_returns_a_successful_result_on_a_good_run
+----------------------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+--------------------------------------------------------------------------
+ActiveRecordCheckTest: test_#check_returns_a_failed_result_on_a_failed_run
+--------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+----------------------------------------------------------------------------
+ActiveRecordCheckTest: test_#check_returns_a_successful_result_on_a_good_run
+----------------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-------------------------------------------------
+ActiveRecordCheckTest: test_given_nil_as_a_config
+-------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+---------------------------------------------------------------------
+SemaphoreCheckTest: test_#run_sets_failure_conditions_on_a_failed_run
+---------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-----------------------------------------------------------------------
+SemaphoreCheckTest: test_#run_sets_success_conditions_on_successful_run
+-----------------------------------------------------------------------
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------------------------
+Easymon::ChecksControllerTest: test_index_returns_valid_json
+------------------------------------------------------------
+Processing by Easymon::ChecksController#index as JSON
+Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms | Allocations: 342)
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------------------------
+Easymon::ChecksControllerTest: test_index_when_a_check_fails
+------------------------------------------------------------
+Processing by Easymon::ChecksController#index as HTML
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 3)
+Completed 503 Service Unavailable in 1ms (Views: 0.2ms | ActiveRecord: 0.0ms | Allocations: 488)
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.6ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.5ms)  BEGIN
+---------------------------------------------------------------------
+Easymon::ChecksControllerTest: test_index_when_a_critical_check_fails
+---------------------------------------------------------------------
+Processing by Easymon::ChecksController#index as HTML
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 503 Service Unavailable in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms | Allocations: 259)
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-------------------------------------------------------------------------
+Easymon::ChecksControllerTest: test_index_when_a_non-critical_check_fails
+-------------------------------------------------------------------------
+Processing by Easymon::ChecksController#index as HTML
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms | Allocations: 312)
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+--------------------------------------------------------------
+Easymon::ChecksControllerTest: test_index_when_all_checks_pass
+--------------------------------------------------------------
+Processing by Easymon::ChecksController#index as HTML
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms | Allocations: 229)
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.2ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+--------------------------------------------------------------------
+Easymon::ChecksControllerTest: test_index_when_no_checks_are_defined
+--------------------------------------------------------------------
+Processing by Easymon::ChecksController#index as HTML
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 503 Service Unavailable in 0ms (Views: 0.0ms | ActiveRecord: 0.0ms | Allocations: 194)
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.2ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+----------------------------------------------------------------
+Easymon::ChecksControllerTest: test_return_403_if_not_authorized
+----------------------------------------------------------------
+Processing by Easymon::ChecksController#index as HTML
+Filter chain halted as :authorize_request rendered or redirected
+Completed 403 Forbidden in 0ms (ActiveRecord: 0.0ms | Allocations: 79)
+Processing by Easymon::ChecksController#show as HTML
+  Parameters: {"check"=>"database"}
+Filter chain halted as :authorize_request rendered or redirected
+Completed 403 Forbidden in 0ms (ActiveRecord: 0.0ms | Allocations: 71)
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+------------------------------------------------------------------
+Easymon::ChecksControllerTest: test_show_if_the_check_is_not_found
+------------------------------------------------------------------
+Processing by Easymon::ChecksController#show as HTML
+  Parameters: {"check"=>"database"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 404 Not Found in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms | Allocations: 204)
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.4ms)  ROLLBACK
+  TRANSACTION (0.2ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-------------------------------------------------------------------
+Easymon::ChecksControllerTest: test_show_json_when_the_check_passes
+-------------------------------------------------------------------
+Processing by Easymon::ChecksController#show as JSON
+  Parameters: {"check"=>"database"}
+Completed 200 OK in 0ms (Views: 0.0ms | ActiveRecord: 0.0ms | Allocations: 175)
+  TRANSACTION (0.3ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+-------------------------------------------------------------
+Easymon::ChecksControllerTest: test_show_when_the_check_fails
+-------------------------------------------------------------
+Processing by Easymon::ChecksController#show as HTML
+  Parameters: {"check"=>"database"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 503 Service Unavailable in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms | Allocations: 213)
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+  TRANSACTION (0.1ms)  BEGIN
+--------------------------------------------------------------
+Easymon::ChecksControllerTest: test_show_when_the_check_passes
+--------------------------------------------------------------
+Processing by Easymon::ChecksController#show as HTML
+  Parameters: {"check"=>"database"}
+  Rendering text template
+  Rendered text template (Duration: 0.0ms | Allocations: 1)
+Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms | Allocations: 188)
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK
+  TRANSACTION (0.1ms)  ROLLBACK

data/test/test_helper.rb

@@ -34,4 +34,4 @@ end
 
 # setting up mocha *after* we load the test libraries as per
 # http://gofreerange.com/mocha/docs/
-require 'mocha/mini_test'
+require 'mocha/minitest'

data/test/unit/checks/split_active_record_check_test.rb

@@ -3,50 +3,50 @@ require 'test_helper'
 class SplitActiveRecordCheckTest < ActiveSupport::TestCase
 
   test "#run sets success conditions on successful run" do
-    master = ActiveRecord::Base.connection
+    primary = ActiveRecord::Base.connection
     Easymon::Base.establish_connection
-    slave = Easymon::Base.connection
+    replica = Easymon::Base.connection
 
-    check = Easymon::SplitActiveRecordCheck.new { [master, slave] }
+    check = Easymon::SplitActiveRecordCheck.new { [primary, replica] }
 
     results = check.check
 
-    assert_equal("Master: Up - Slave: Up", results[1])
+    assert_equal("Primary: Up - Replica: Up", results[1])
     assert_equal(true, results[0])
   end
 
-  test "#run sets failed conditions when slave is down" do
-    master = ActiveRecord::Base.connection
+  test "#run sets failed conditions when replica is down" do
+    primary = ActiveRecord::Base.connection
     Easymon::Base.establish_connection
-    slave = Easymon::Base.connection
+    replica = Easymon::Base.connection
 
-    slave.stubs(:active?).raises("boom")
+    replica.stubs(:active?).raises("boom")
 
-    check = Easymon::SplitActiveRecordCheck.new { [master, slave] }
+    check = Easymon::SplitActiveRecordCheck.new { [primary, replica] }
     results = check.check
 
-    assert_equal("Master: Up - Slave: Down", results[1])
+    assert_equal("Primary: Up - Replica: Down", results[1])
     assert_equal(false, results[0])
   end
 
-  test "#run sets failed conditions when master is down" do
-    master = ActiveRecord::Base.connection
+  test "#run sets failed conditions when primary is down" do
+    primary = ActiveRecord::Base.connection
     Easymon::Base.establish_connection
-    slave = Easymon::Base.connection
+    replica = Easymon::Base.connection
 
-    master.stubs(:active?).raises("boom")
+    primary.stubs(:active?).raises("boom")
 
-    check = Easymon::SplitActiveRecordCheck.new { [master, slave] }
+    check = Easymon::SplitActiveRecordCheck.new { [primary, replica] }
     results = check.check
 
-    assert_equal("Master: Down - Slave: Up", results[1])
+    assert_equal("Primary: Down - Replica: Up", results[1])
     assert_equal(false, results[0])
   end
 
   test "given nil as a config" do
     check = Easymon::SplitActiveRecordCheck.new { }
     results = check.check
-    assert_equal("Master: Down - Slave: Down", results[1])
+    assert_equal("Primary: Down - Replica: Down", results[1])
     assert_equal(false, results[0])
   end
 end
@@ -63,8 +63,8 @@ module Easymon
     end
 
     def database_configuration
-      env = "#{Rails.env}_slave"
-      config = YAML.load_file(Rails.root.join('config/database.yml'))[env]
+      env = "#{Rails.env}_replica"
+      YAML.load_file(Rails.root.join('config/database.yml'))[env]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easymon
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: 1.6.2
 platform: ruby
 authors:
 - Nathan Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -70,28 +70,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,7 @@ files:
 - test/controllers/easymon/checks_controller_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/easymon.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -173,6 +174,7 @@ files:
 - test/dummy/config/memcached.yml
 - test/dummy/config/redis.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/storage.yml
 - test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/404.html
@@ -237,6 +239,7 @@ test_files:
 - test/dummy/app/views/easymon/index.html.erb
 - test/dummy/app/views/easymon/show.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/easymon.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -250,6 +253,7 @@ test_files:
 - test/dummy/config/environments/test.rb
 - test/dummy/config/environment.rb
 - test/dummy/config/redis.yml
+- test/dummy/config/storage.yml
 - test/dummy/config/application.rb
 - test/dummy/config/memcached.yml
 - test/dummy/config/database.yml