fixed Hypnotoad to clean up lock files

mojolicious · Sep 6, 2011 · 89fda4b · 89fda4b
1 parent 4c95280
commit 89fda4b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -3,6 +3,7 @@ This file documents the revision history for Perl extension Mojolicious.
 1.98    2011-09-06 00:00:00
         - Improved tests.
         - Fixed small bug in cookie jar.
+        - Fixed Hypnotoad to clean up lock files.
 
 1.97    2011-09-03 00:00:00
         - Improved unicode handling to be more correct and less forgiving.

diff --git a/lib/Mojo/Server/Hypnotoad.pm b/lib/Mojo/Server/Hypnotoad.pm
@@ -25,8 +25,8 @@ sub DESTROY {
   return unless $self->{done};
 
   # Manager
-  return unless my $file = $self->{config}->{pid_file};
-  unlink $file if -w $file;
+  if (my $file = $self->{config}->{pid_file})  { unlink $file if -w $file }
+  if (my $file = $self->{config}->{lock_file}) { unlink $file if -w $file }
 }
 
 # "Marge? Since I'm not talking to Lisa,
@@ -149,7 +149,8 @@ sub _config {
   $c->{heartbeat_timeout}  ||= 5;
   $c->{lock_file}
     ||= File::Spec->catfile($ENV{MOJO_TMPDIR} || File::Spec->tmpdir,
-    "hypnotoad.$$.lock");
+    'hypnotoad.lock');
+  $c->{lock_file} .= ".$$";
   $c->{pid_file}
     ||= File::Spec->catfile(dirname($ENV{HYPNOTOAD_APP}), 'hypnotoad.pid');
   $c->{upgrade_timeout} ||= 30;