mysql_health 0.5.6 → 0.5.7

data/lib/mysql_health/command_line.rb

@@ -65,11 +65,21 @@ module MysqlHealth
             @options[:check][:slave] = true
           end
 
+          @options[:check][:database] = nil
+          opts.on( '--check:database NAME', 'Ensure that database exists') do |name|
+            @options[:check][:database] = name
+          end
+
           @options[:check][:allow_overlapping] = false
           opts.on( '--check:allow-overlapping', "Allow overlapping health checks (default: #{@options[:check][:allow_overlapping]})") do
             @options[:check][:allow_overlapping] = true
           end
 
+          @options[:check][:allow_master] = false
+          opts.on( '--check:allow-master', "Allow master to act as slave when --check:slave is used (default: #{@options[:check][:allow_master]})") do
+            @options[:check][:allow_master] = true
+          end
+
           @options[:check][:interval] = '10s'
           opts.on( '--check:interval INTERVAL', "Check health every INTERVAL (default: #{@options[:check][:interval]})") do |interval|
             @options[:check][:interval] = interval.to_s
@@ -77,7 +87,7 @@ module MysqlHealth
 
           @options[:check][:delay] = '0s'
           opts.on( '--check:delay DELAY', "Delay health checks for INTERVAL (default: #{@options[:check][:delay]})") do |delay|
-            @options[:check][:delay] = interval.to_s
+            @options[:check][:delay] = delay.to_s
           end
 
           @options[:check][:dsn] ||= "DBI:Mysql:mysql:localhost"
@@ -92,13 +102,13 @@ module MysqlHealth
 
           @options[:check][:password] ||= ""
           opts.on( '--check:password PASSWORD', "MySQL Password (default: #{@options[:check][:password]})") do |password|
-            @options[:check][:password] = interval.to_s
+            @options[:check][:password] = password.to_s
           end
 
           # Server
           @options[:server][:listen] = '0.0.0.0'
           opts.on( '-l', '--server:listen ADDR', "Server listen address (default: #{@options[:server][:listen]})") do |addr|
-            @options[:server][:addr] = host.to_s
+            @options[:server][:addr] = addr.to_s
           end
 
           @options[:server][:port] = 3305

data/lib/mysql_health/health.rb

@@ -71,7 +71,7 @@ module MysqlHealth
 
     def master_status=(response)
       @mutex.synchronize do
-        MysqlHealth.log.info("master status: #{response[:status]}")
+        MysqlHealth.log.info("master status: #{response[:status]} (#{response[:content].split(/\n/)[0]})")
         @master_status = response
       end
     end
@@ -86,7 +86,7 @@ module MysqlHealth
 
     def slave_status=(response)
       @mutex.synchronize do 
-        MysqlHealth.log.info("slave status: #{response[:status]}")
+        MysqlHealth.log.info("slave status: #{response[:status]} (#{response[:content].split(/\n/)[0]})")
         @slave_status = response
       end
     end
@@ -104,6 +104,10 @@ module MysqlHealth
       return (variables.length == 1)
     end
 
+    def master?(dbh)
+      read_only?(dbh) == false
+    end
+
     def check_master
       MysqlHealth.log.debug("check_master")
       response = {}
@@ -113,23 +117,25 @@ module MysqlHealth
         # connect to the MySQL server
         dbh = DBI.connect(@options[:dsn], @options[:username], @options[:password])
 
-        status = {}
-        dbh.select_all('SHOW STATUS') do |row|
-          status[row[0].downcase.to_sym] = row[1]
+        # Validate that database exists
+        unless @options[:database].nil?
+          unless database?(dbh, @options[:database])
+            raise Exception.new("Database schema named #{@options[:database]} does not exist")
+          end
         end
-        mysqladmin_status = "Uptime: %s  Threads: %s  Questions: %s  Slow queries: %s  Opens: %s  Flush tables: %s  Open tables: %s  Queries per second avg: %.3f\n" %
-                  [ status[:uptime], status[:threads_running], status[:questions], status[:slow_queries], status[:opened_tables], status[:flush_commands], status[:open_tables], status[:queries].to_i/status[:uptime].to_i]
+
+        status = show_status(dbh)
         if status.length > 0
           if read_only?(dbh)
             response[:status] = '503 Service Read Only'
-            response[:content] = mysqladmin_status
+            response[:content] = describe_status(status)
           else
             response[:status] = '200 OK'
-            response[:content] = mysqladmin_status
+            response[:content] = describe_status(status)
           end
         else
           response[:status] = '503 Service Unavailable'
-          response[:content] = mysqladmin_status
+          response[:content] = describe_status(status)
         end
       rescue Exception => e
         response[:status] = '500 Server Error'
@@ -138,6 +144,46 @@ module MysqlHealth
       self.master_status=(response)
     end
 
+    def describe_status(status)
+      # Mimick "mysqladmin status"
+      "Uptime: %s  Threads: %s  Questions: %s  Slow queries: %s  Opens: %s  Flush tables: %s  Open tables: %s  Queries per second avg: %.3f\n" %
+                [ status[:uptime], status[:threads_running], status[:questions], status[:slow_queries], status[:opened_tables], status[:flush_commands], status[:open_tables], status[:queries].to_i/status[:uptime].to_i]
+    end
+
+    # Return a hash of status information
+    def show_status(dbh, type = nil)
+      status = {}
+      if type.nil?
+        # Format of "SHOW STATUS" differs from "SHOW [MASTER|SLAVE] STATUS"
+        dbh.select_all('SHOW STATUS') do |row|
+          status[row[0].downcase.to_sym] = row[1]
+        end
+      else
+        dbh.execute('SHOW %s STATUS' % type.to_s.upcase) do |sth|
+          sth.fetch_hash() do |row|
+            row.each_pair do |k,v|
+              status[k.downcase.to_sym] = v
+            end
+          end
+        end
+      end
+      status
+    end
+
+    def show_create_database(dbh, name)
+      schema = nil
+      dbh.execute('SHOW CREATE DATABASE %s' % name) do |sth|
+        sth.fetch() do |row|
+          schema = row[1]
+        end
+      end
+      return schema
+    end
+
+    def database?(dbh, name)
+      show_create_database(dbh, name).nil? == false
+    end
+
     def check_slave
       MysqlHealth.log.debug("check_slave")
       response = {}
@@ -147,41 +193,42 @@ module MysqlHealth
         # connect to the MySQL server
         dbh = DBI.connect(@options[:dsn], @options[:username], @options[:password])
 
-        show_slave_status = []
-        status = {}
-        dbh.execute('SHOW SLAVE STATUS') do |sth|
-          sth.fetch_hash() do |row|
-            row.each_pair do |k,v|
-              status[k.downcase.to_sym] = v
-              show_slave_status << "#{k}: #{v}"
-            end
+        # Validate that database exists
+        unless @options[:database].nil?
+          unless database?(dbh, @options[:database])
+            raise Exception.new("Database schema named #{@options[:database]} does not exist")
           end
         end
 
-        if status.length > 0
-          seconds_behind_master = status[:seconds_behind_master]
+        show_slave_status = show_status(dbh, :slave)
+        if show_slave_status.length > 0
+          seconds_behind_master = show_slave_status[:seconds_behind_master]
 
           # We return a "203 Non-Authoritative Information" when replication is shot. We don't want to reduce site performance, but still want to track that something is awry.
           if seconds_behind_master.eql?('NULL')
             response[:status] = '203 Slave Stopped'
-            response[:content] = status.to_json
+            response[:content] = show_slave_status.to_json
             response[:content_type] = 'application/json'
           elsif seconds_behind_master.to_i > 60*30
             response[:status] = '203 Slave Behind'
-            response[:content] = status.to_json
+            response[:content] = show_slave_status.to_json
             response[:content_type] = 'application/json'
           elsif read_only?(dbh)
             response[:status] = '200 OK ' + seconds_behind_master  + ' Seconds Behind Master'
-            response[:content] = status.to_json
+            response[:content] = show_slave_status.to_json
             response[:content_type] = 'application/json'
           else
             response[:status] = '503 Service Unavailable'
-            response[:content] = status.to_json
+            response[:content] = show_slave_status.to_json
             response[:content_type] = 'application/json'
           end
+        elsif @options[:allow_master] && master?(dbh)
+            response[:status] = '200 OK Master Running'
+            response[:content] = describe_status show_status(dbh)
+            response[:content_type] = 'application/json'
         else
           response[:status] = '503 Slave Not Configured'
-          response[:content] = show_slave_status.join("\n")
+          response[:content] = show_slave_status.to_json
         end
       rescue Exception => e
         response[:status] = '500 Server Error'

data/lib/mysql_health/version.rb

@@ -18,5 +18,5 @@
 # along with mysql_health.  If not, see <http://www.gnu.org/licenses/>.
 #
 module MysqlHealth
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/redhat/rubygem-mysql_health.spec

@@ -1,7 +1,7 @@
 %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %define gemname mysql_health
-%define gemversion 0.5.6
+%define gemversion 0.5.7
 %define geminstdir %{gemdir}/gems/%{gemname}-%{gemversion}
 %define gemfile %{gemname}-%{gemversion}.gem
 %define gemsummary %(ruby -rrubygems -e 'puts YAML.load(`gem specification %{gemfile}`).summary')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Erik Osterman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-05 00:00:00 -08:00
+date: 2012-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency