Merge pull request ManageIQ#15491 from jrafanie/do_not_remove_other_p…

…rocess_pidfile Only remove my process' pidfile.
d-m-u · Jul 1, 2017 · 8dff3ce · 8dff3ce
2 parents a13b67b + 9090b3e
commit 8dff3ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/pid_file.rb b/lib/pid_file.rb
@@ -21,7 +21,7 @@ def pid
   end
 
   def remove
-    FileUtils.rm(@fname) if File.file?(@fname)
+    FileUtils.rm(@fname) if pid == Process.pid
   end
 
   def create(remove_on_exit = true)

diff --git a/spec/lib/pid_file_spec.rb b/spec/lib/pid_file_spec.rb
@@ -40,8 +40,8 @@
       @pid_file.remove
     end
 
-    it "deletes when file does exist" do
-      allow(File).to receive(:file?).with(@fname).and_return(true)
+    it "deletes when file exist and is our process" do
+      allow(@pid_file).to receive(:pid).and_return(Process.pid)
       expect(FileUtils).to receive(:rm).with(@fname).once
       @pid_file.remove
     end