mysql_health 0.5.3 → 0.5.4

data/lib/mysql_health/command_line.rb

@@ -147,12 +147,6 @@ module MysqlHealth
         @log = Logger.new(@options[:log][:file], @options[:log][:age], @options[:log][:size])
         @log.level = @options[:log][:level]
 
-        daemonize if @options[:server][:daemonize]
-        write_pid_file if @options[:server][:pid_file]
-
-        MysqlHealth.log = @log
-        MysqlHealth.health = Health.new(@options[:check])
-
       rescue ArgumentException => e
         puts e.message
         puts @optparse
@@ -182,16 +176,30 @@ module MysqlHealth
       end
     end
 
+    def remove_pid_file
+      File.unlink(@options[:server][:pid_file]) if @options[:server][:pid_file] && File.exists?(@options[:server][:pid_file])
+    end
+
     def execute
       begin
+        daemonize if @options[:server][:daemonize]
+        write_pid_file if @options[:server][:pid_file]
+
+        MysqlHealth.log = @log
+        MysqlHealth.health = Health.new(@options[:check])
+
         ::EM.run do
           ::EM.start_server @options[:server][:listen], @options[:server][:port], Server
         end
+        remove_pid_file()
       rescue ArgumentException => e
+        remove_pid_file()
         @log.fatal(e.message)
       rescue Interrupt => e
+        remove_pid_file()
         @log.info("exiting...")
       rescue Exception => e
+        remove_pid_file()
         @log.fatal(e.message + e.backtrace.join("\n"))
       end
     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.3"
+  VERSION = "0.5.4"
 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.3
+%define gemversion 0.5.4
 %define geminstdir %{gemdir}/gems/%{gemname}-%{gemversion}
 %define gemfile %{gemname}-%{gemversion}.gem
 %define gemsummary %(ruby -rrubygems -e 'puts YAML.load(`gem specification %{gemfile}`).summary')
@@ -66,7 +66,7 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 %{_initrddir}/%{gemname}
 %{_sysconfdir}/%{gemname}/
-%{_sysconfdir}/sysconfig/%{gemname}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{gemname}
 
 %changelog
 * Sun Jul 29 2012 Erik Osterman <e@osterman.com>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Erik Osterman