murakumo 0.2.6 → 0.2.7

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_health_checker.rb

@@ -12,6 +12,7 @@ module Murakumo
       @name = name
       @cloud = cloud
       @logger = logger
+      @options = options
 
       # 各種変数の設定
       {
@@ -97,7 +98,7 @@ module Murakumo
 
             begin
               retval = timeout(@timeout) {
-                HealthCheckerContext.new.instance_eval(@script)
+                HealthCheckerContext.new(:name => @name, :logger => @logger, :options => @options).instance_eval(@script)
               }
             rescue Timeout::Error
               retval = false

data/lib/srv/murakumo_health_checker_context.rb

@@ -8,6 +8,12 @@ module Murakumo
   # ヘルスチェックのコンテキスト
   class HealthCheckerContext
 
+    def initialize(vars = {})
+      vars.each do |name, val|
+        instance_variable_set("@#{name}", val)
+      end
+    end
+
     # TCPチェッカー
     def tcp_check(port, host = '127.0.0.1')
       s = TCPSocket.new(host, port)
@@ -29,35 +35,38 @@ module Murakumo
     end
 
     # MySQLのドライバがあれば、MySQLチェッカーを定義
-    has_mysql = false
+    mysql_class = nil
 
     begin
       require 'mysql'
-      has_mysql = true
+      mysql_class = Mysql
     rescue LoadError
       begin
         require 'mysql2'
-        has_mysql = true
+        mysql_class = Mysql2
       rescue LoadError
       end
     end
 
-    if has_mysql
-      def mysql_check(user, passwd = nil, port_sock = 3306, host = '127.0.0.1', db = nil)
-        port = nil
-        sock = nil
+    if mysql_class
+      class_eval <<-EOS
+        def mysql_check(user, passwd = nil, port_sock = 3306, host = '127.0.0.1', db = nil)
+          port = nil
+          sock = nil
 
-        if port_sock.kind_of?(Integer)
-          port = port_sock
-        else
-          sock = port_sock
-        end
+          if port_sock.kind_of?(Integer)
+            port = port_sock
+          else
+            sock = port_sock
+          end
 
-        my = Mysql.new(host, user, passwd, db, port, sock)
-        !!(my.respond_to?(:ping) ? my.ping : my.stat)
-      rescue
-        false
-      end
+          my = #{mysql_class}.new(host, user, passwd, db, port, sock)
+          !!(my.respond_to?(:ping) ? my.ping : my.stat)
+        rescue => e
+          @logger.debug(e.message)
+          false
+        end
+      EOS
     end
 
   end # HealthCheckerContext

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - winebarrel