murakumo 0.3.2 → 0.3.3

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_health_check_context.rb

@@ -1,5 +1,6 @@
 require 'net/http'
 require 'net/smtp'
+require 'net/telnet'
 require 'socket'
 
 require 'misc/murakumo_const'
@@ -26,7 +27,7 @@ module Murakumo
     end
 
     # HTTPチェッカー
-    def http_get(path, statuses = [200], host = '127.0.0.1', port = 80)
+    def http_get(path, statuses = [200], port = 80, host = '127.0.0.1')
       res = Net::HTTP.start('127.0.0.1', 80) do |http|
         http.read_timeout = @options['timeout']
         http.get(path)
@@ -46,8 +47,18 @@ module Murakumo
       return false
     end
 
-    # MySQLのドライバがあれば、MySQLチェッカーを定義
-    mysql_class = nil
+    # memcachedチェッカー
+    def memcached_check(port = 11211, host = '127.0.0.1')
+      telnet = Net::Telnet.new('Host' => host, 'Port' => port)
+      !!telnet.cmd('String' => 'stats', 'Match' => /END/i, 'Timeout' => @options['timeout'])
+    rescue =>e 
+      @logger.debug("#{@name}: #{e.message}")
+      return false
+    ensure
+      if telnet
+        telnet.close rescue nil
+      end
+    end
 
     begin
       require 'mysql'
@@ -68,37 +79,43 @@ module Murakumo
         @logger.debug("#{@name}: #{e.message}")
         return false
       ensure
-        my.close if my
+        if my
+          my.close rescue nil
+        end
       end
     rescue LoadError
     end
 
-    begin
-      require 'mysql2'
-
-      def mysql_check(user, passwd = nil, port_sock = 3306, host = '127.0.0.1', db = nil)
-        opts = {}
-        opts[:username] = user
-        opts[:password] = passwd if passwd
-        opts[:host]     = host if host
-        opts[:database] = db if db
-
-        if port_sock.kind_of?(Integer)
-          opts[:port] = port_sock
-        else
-          opts[:socket] = port_sock
+    unless defined?(:mysql_check)
+      begin
+        require 'mysql2'
+
+        def mysql_check(user, passwd = nil, port_sock = 3306, host = '127.0.0.1', db = nil)
+          opts = {}
+          opts[:username] = user
+          opts[:password] = passwd if passwd
+          opts[:host]     = host if host
+          opts[:database] = db if db
+
+          if port_sock.kind_of?(Integer)
+            opts[:port] = port_sock
+          else
+            opts[:socket] = port_sock
+          end
+
+          my = Mysql2::Client.new(opts)
+          my.ping
+        rescue => e
+          @logger.debug("#{@name}: #{e.message}")
+          return false
+        ensure
+          if my
+            my.close rescue nil
+          end
         end
-
-        my = Mysql2::Client.new(opts)
-        my.ping
-      rescue => e
-        @logger.debug("#{@name}: #{e.message}")
-        return false
-      ensure
-        my.close if my
+      rescue LoadError
       end
-    rescue LoadError
-    end
+    end # unless defined?(:mysql_check)
 
   end # HealthCheckContext
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - winebarrel