Fixing the logging bug I introduced with my refactoring.

jnewland · May 14, 2008 · 4d7410d · 4d7410d
1 parent 3c079f0
commit 4d7410d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+== 2.0.2
+
+* Fixed the logging bug I introduced by moving the PID check into the Command
+  class
+
 == 2.0.1
 
 * Added some safety code to ensure SystemExit exceptions are not caught in our

diff --git a/lib/scout.rb b/lib/scout.rb
@@ -5,5 +5,5 @@
 require "scout/server"
 
 module Scout
-  VERSION = "2.0.1".freeze
+  VERSION = "2.0.2".freeze
 end
diff --git a/lib/scout/command.rb b/lib/scout/command.rb
@@ -185,7 +185,7 @@ def create_pid_file_or_exit
           begin
             File.unlink(pid_file)
           rescue
-            log.error "Unable to unlink pid file:  #{$!.message}"
+            log.error "Unable to unlink pid file:  #{$!.message}" if log
           end
         end
       rescue
@@ -199,10 +199,10 @@ def create_pid_file_or_exit
           # do nothing, we didn't have permission to check the running process
         end
         if running
-          log.warn "Process #{pid} was already running"
+          log.warn "Process #{pid} was already running" if log
           exit
         else
-          log.info "Stale PID file found.  Clearing it and reloading..."
+          log.info "Stale PID file found.  Clearing it and reloading..." if log
           File.unlink(pid_file) rescue nil
           retry
         end