--- a/script/task_performer
+++ b/script/task_performer
@@ -6,29 +6,27 @@ require "fileutils"
 LOCK_FILE_PATH = File.join(Dir.tmpdir, "gitorious_task_lockfile")
 ENV["PATH"] = "/usr/local/bin/:/opt/local/bin:#{ENV["PATH"]}"
 
-if File.exist?(LOCK_FILE_PATH)
-    $stderr.puts "Task lockfile '#{LOCK_FILE_PATH}' exists!"
-    exit(1)
-end
-
 ENV["RAILS_ENV"] ||= "production"
 require File.dirname(__FILE__) + "/../config/environment"
 
-
 class TaskLockError < StandardError; end
 
 def with_lock(&block)
   begin
     if File.exist?(LOCK_FILE_PATH)
-      raise TaskLockError
+      pid = IO.read( LOCK_FILE_PATH ).to_i
+      if File.directory?("/proc/#{pid}/")
+        raise TaskLockError
+      else # STALE LOCK FILE
+        FileUtils.rm(LOCK_FILE_PATH)
+      end
     end
-    FileUtils.touch(LOCK_FILE_PATH)
+    File.open(LOCK_FILE_PATH,'w') { |f| f << $$ }
     yield
+    FileUtils.rm(LOCK_FILE_PATH) if File.exist?(LOCK_FILE_PATH)
   rescue TaskLockError
-    $stderr.puts "Task lockfile exists"
+    $stderr.puts "Task lockfile exists - long running task_performer?"
     exit(1)
-	ensure
-		FileUtils.rm(LOCK_FILE_PATH)
   end
 end