0
@@ -34,11 +34,20 @@
0
     
0
     # Turns the current script into a daemon process that detaches from the console.
0
     def daemonize
0
-      raise PlatformNotSupported, 'Daemonizing  not supported on Windows'     if Thin.win?
0
+      raise PlatformNotSupported, 'Daemonizing is not supported on Windows'     if Thin.win?
0
       raise ArgumentError,        'You must specify a pid_file to daemonize' unless @pid_file
0
-      raise PidFileExist,         "#{@pid_file} already exist, seems like it's already running. " +
0
-                                  "Stop the process or delete #{@pid_file}." if File.exist?(@pid_file)
0
-      
0
+
0
+      # If PID file is stale, remove it.
0
+      if File.exist?(@pid_file)
0
+        if pid && Process.running?(pid)
0
+          raise PidFileExist, "#{@pid_file} already exists, seems like it's already running (process ID: #{pid}). " +
0
+                              "Stop the process or delete #{@pid_file}."
0
+        else
0
+          log ">> Deleting stale PID file #{@pid_file}"
0
+          remove_pid_file
0
+        end
0
+      end
0
+
0
       pwd = Dir.pwd # Current directory is changed during daemonization, so store it
0
       
0
       Daemonize.daemonize(File.expand_path(@log_file), name)
0
@@ -53,7 +62,7 @@
0
         remove_pid_file
0
       end
0
     end
0
-    
0
+
0
     # Change privileges of the process
0
     # to the specified user and group.
0
     def change_privilege(user, group=user)
0
0
@@ -73,12 +82,12 @@
0
       log "Couldn't change user and group to #{user}:#{group}: #{e}"
0
     end
0
     
0
-    # Registerer a proc to be called to restart the server.
0
+    # Registerer a proc to be called to restart the server.
0
     def on_restart(&block)
0
       @on_restart = block
0
     end
0
     
0
-    # Restart the server
0
+    # Restart the server.
0
     def restart
0
       raise ArgumentError, "Can't restart, no 'on_restart' proc specified" unless @on_restart
0
       log '>> Restarting ...'
0
@@ -108,7 +117,7 @@
0
         File.delete(pid_file) if File.exist?(pid_file)
0
       end
0
       
0
-      # Restart the server by sending HUP signal
0
+      # Restart the server by sending HUP signal.
0
       def restart(pid_file)
0
         send_signal('HUP', pid_file)
0
       end