murakumo 0.2.8 → 0.2.9

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_health_checker_context.rb

@@ -39,34 +39,53 @@ module Murakumo
 
     begin
       require 'mysql'
-      mysql_class = Mysql
-    rescue LoadError
-      begin
-        require 'mysql2'
-        mysql_class = Mysql2::Client
-      rescue LoadError
+
+      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
+
+        my = Mysql.new(host, user, passwd, db, port, sock)
+        !!(my.respond_to?(:ping) ? my.ping : my.stat)
+      rescue => e
+        @logger.debug(e.message)
+        return false
+      ensure
+        my.close if my
       end
+    rescue LoadError
     end
 
-    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
-
-          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
+    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
-      EOS
+
+        my = Mysql2::Client.new(opts)
+        my.ping
+      rescue => e
+        @logger.debug(e.message)
+        return false
+      ensure
+        my.close if my
+      end
+    rescue LoadError
     end
 
   end # HealthCheckerContext

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - winebarrel