komachi_heartbeat 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 172965952080275e081af23b4ddb15ee4470a27a
-  data.tar.gz: f70a823016e6c34b4c52182017ab19b633a7d2d2
+  metadata.gz: b08e53dc3bec78d7fdd331fbc0ee3a58d9185b88
+  data.tar.gz: 7615fa3291f59b2467afde97da7a7ba3b2e9fd5b
 SHA512:
-  metadata.gz: 348f425ca5a95e737bba50730a48aa2344e49f6ff13df8f4758368cea368742f202f07aee8aefdb84ed1d25b781979e8b34bccc5bca0db9cab59c108ad904a18
-  data.tar.gz: 073a22a9daeb02f9de54115c6d23e0b9b2fd0a930681bbb80adea1b26a8d5bed7f4284218c7b718f9303b9c7bbf6d9e016bbcd32c8fdabf9bc20eefcceb0c420
+  metadata.gz: eff3927fa76e4a266893690a064c6a406674783553fb98b3451223944d754c838271b6950d790ec828c6ea12286d4b49f70ea598ab2fb911f101c8a4be9f1d2f
+  data.tar.gz: 802a423a43b7fbdf7bf01a0b22e4ef106ab66542b1d035b7a19a128f856e93e7b500838d67398b40659a0a1d83796dcf6357a4a60d5616ab0f2603c79a6c9efe

data/README.md

@@ -40,12 +40,15 @@ Rails アプリケーションとDBサーバーの死活監視するためのURL
 - `redis_check_enabled`
  - Redisをチェックするかどうか
  - default: false
+- `redis_servers`
+ - Redisのサーバー情報
+ - default: [{host: "localhost", port: 6379, db: 0}]
 - `memcached_check_enabled`
  - Memcachedをチェックするかどうか
  - default: false
-- `memcached_server`
- - Memcachedのサーバー名
- - default: 'localhost'
+- `memcached_server_names`
+ - Memcachedのサーバー名の配列
+ - default: ['localhost']
 
 ### Example
 

data/app/controllers/komachi_heartbeat/heartbeat_controller.rb

@@ -2,12 +2,17 @@ require_dependency "komachi_heartbeat/application_controller"
 
 module KomachiHeartbeat
   class HeartbeatController < ApplicationController
+
     def index
-      db_connection_check if db_check?
-      redis_connection_check if redis_check?
-      memcached_connection_check if memcached_check?
+      begin
+        db_connection_check if db_check?
+        redis_connection_check if redis_check?
+        memcached_connection_check if memcached_check?
 
-      head :ok
+        head :ok
+      rescue => e
+        head :internal_server_error
+      end
     end
 
     def version
@@ -17,11 +22,10 @@ module KomachiHeartbeat
     end
 
     private
-    def redis_connection_check
-      c = Redis::Client.new
-      c.connect
-      raise "Redis connection failed" unless c.connected?
-      c.disconnect
+
+    # ---- Database
+    def db_check?
+      !!KomachiHeartbeat.config.db_check_enabled
     end
 
     def db_connection_check
@@ -30,28 +34,38 @@ module KomachiHeartbeat
       end
     end
 
-    def memcached_connection_check
-      MemCache.new(memcached_server_name).stats
+    def connection_database_class_names
+      KomachiHeartbeat.config.database_class_names.presence || []
     end
 
-    def memcached_check?
-      defined?(MemCache) && !!KomachiHeartbeat.config.memcached_check_enabled
+    # ---- Redis
+    def redis_check?
+      defined?(Redis) && !!KomachiHeartbeat.config.redis_check_enabled
     end
 
-    def db_check?
-      !!KomachiHeartbeat.config.db_check_enabled
+    def redis_connection_check
+      redis_servers.each do |hash|
+        Redis.new(hash).ping
+      end
     end
 
-    def redis_check?
-      defined?(Redis) && !!KomachiHeartbeat.config.redis_check_enabled
+    def redis_servers
+      KomachiHeartbeat.config.redis_servers.presence || []
     end
 
-    def connection_database_class_names
-      KomachiHeartbeat.config.database_class_names.presence || ["ActiveRecord::Base"]
+    # ---- Memcached
+    def memcached_server_names
+      KomachiHeartbeat.config.memcached_server_names.presence || []
     end
 
-    def memcached_server_name
-      KomachiHeartbeat.config.memcached_server
+    def memcached_connection_check
+      memcached_server_names.each do |memcached_server_name|
+        MemCache.new(memcached_server_name).stats
+      end
+    end
+
+    def memcached_check?
+      defined?(MemCache) && !!KomachiHeartbeat.config.memcached_check_enabled
     end
 
     def application_name

data/lib/komachi_heartbeat/config.rb

@@ -1,7 +1,7 @@
 module KomachiHeartbeat
   class Config
     include ActiveSupport::Configurable
-    config_accessor :application_version, :application_name, :db_check_enabled, :redis_check_enabled, :memcached_check_enabled, :database_class_names, :memcached_server
+    config_accessor :application_version, :application_name, :db_check_enabled, :redis_check_enabled, :memcached_check_enabled, :database_class_names, :memcached_server_names, :redis_servers
 
     configure do |config|
       config.application_name = "Unknown"
@@ -10,9 +10,10 @@ module KomachiHeartbeat
       config.database_class_names = ["ActiveRecord::Base"]
 
       config.redis_check_enabled = false
+      config.redis_servers = [{host: "localhost", port: 6379, db: 0}]
 
       config.memcached_check_enabled = false
-      config.memcached_server = "localhost"
+      config.memcached_server_names = ["localhost"]
     end
   end
 end

data/lib/komachi_heartbeat/version.rb

@@ -1,3 +1,3 @@
 module KomachiHeartbeat
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: komachi_heartbeat
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Takumi MIURA