mysql_health 0.5.5 → 0.5.6

data/lib/mysql_health/health.rb

@@ -106,78 +106,86 @@ module MysqlHealth
 
     def check_master
       MysqlHealth.log.debug("check_master")
-
-      # connect to the MySQL server
-      dbh = DBI.connect(@options[:dsn], @options[:username], @options[:password])
-
       response = {}
       response[:content_type] = 'text/plain'
 
-      status = {}
-      dbh.select_all('SHOW STATUS') do |row|
-        status[row[0].downcase.to_sym] = row[1]
-      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]
-      if status.length > 0
-        if read_only?(dbh)
-          response[:status] = '503 Service Read Only'
-          response[:content] = mysqladmin_status
+      begin
+        # 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]
+        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]
+        if status.length > 0
+          if read_only?(dbh)
+            response[:status] = '503 Service Read Only'
+            response[:content] = mysqladmin_status
+          else
+            response[:status] = '200 OK'
+            response[:content] = mysqladmin_status
+          end
         else
-          response[:status] = '200 OK'
+          response[:status] = '503 Service Unavailable'
           response[:content] = mysqladmin_status
         end
-      else
-        response[:status] = '503 Service Unavailable'
-        response[:content] = mysqladmin_status
+      rescue Exception => e
+        response[:status] = '500 Server Error'
+        response[:content] = e.message
       end
       self.master_status=(response)
     end
 
     def check_slave
       MysqlHealth.log.debug("check_slave")
-
-      # connect to the MySQL server
-      dbh = DBI.connect(@options[:dsn], @options[:username], @options[:password])
-
       response = {}
       response[:content_type] = 'text/plain'
 
-      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}"
+      begin
+        # 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
           end
         end
-      end
 
-      if status.length > 0
-        seconds_behind_master = 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_type] = 'application/json'
-        elsif seconds_behind_master.to_i > 60*30
-          response[:status] = '203 Slave Behind'
-          response[:content] = 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_type] = 'application/json'
+        if status.length > 0
+          seconds_behind_master = 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_type] = 'application/json'
+          elsif seconds_behind_master.to_i > 60*30
+            response[:status] = '203 Slave Behind'
+            response[:content] = 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_type] = 'application/json'
+          else
+            response[:status] = '503 Service Unavailable'
+            response[:content] = status.to_json
+            response[:content_type] = 'application/json'
+          end
         else
-          response[:status] = '503 Service Unavailable'
-          response[:content] = status.to_json
-          response[:content_type] = 'application/json'
+          response[:status] = '503 Slave Not Configured'
+          response[:content] = show_slave_status.join("\n")
         end
-      else
-        response[:status] = '503 Slave Not Configured'
-        response[:content] = show_slave_status.join("\n")
+      rescue Exception => e
+        response[:status] = '500 Server Error'
+        response[:content] = e.message
       end
       self.slave_status=(response)
     end

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.5"
+  VERSION = "0.5.6"
 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.5
+%define gemversion 0.5.6
 %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
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Erik Osterman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-05 00:00:00 -07:00
+date: 2012-12-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency