[Jifty-commit] r7118 - jifty/trunk/lib/Jifty/Script

Jifty commits jifty-commit at lists.jifty.org
Mon Jun 1 13:56:27 EDT 2009


Author: sartak
Date: Mon Jun  1 13:56:27 2009
New Revision: 7118

Modified:
   jifty/trunk/lib/Jifty/Script/Server.pm

Log:
Automatically create the pid dir if it's not existent

Modified: jifty/trunk/lib/Jifty/Script/Server.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Server.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Server.pm	Mon Jun  1 13:56:27 2009
@@ -20,8 +20,9 @@
 use File::Path ();
 use Jifty::Util;
 
-use constant PIDFILE => Jifty::Util->absolute_path('var/jifty-server.pid');
-use constant PARENTPIDFILE => Jifty::Util->absolute_path('var/jifty-server-parent.pid');
+use constant PIDDIR => Jifty::Util->absolute_path('var/');
+use constant PIDFILE => PIDDIR . 'jifty-server.pid';
+use constant PARENTPIDFILE => PIDDIR . 'jifty-server-parent.pid';
 
 =head1 NAME
 
@@ -147,6 +148,9 @@
 
     die 'fork failed' unless defined $pid;
     if ($pid) {
+        mkdir PIDDIR or die "Can't create directory @{[PIDDIR]}: $!"
+            if !-d PIDDIR;
+
         open my $fh, '>', PARENTPIDFILE or die "Can't open @{[PARENTPIDFILE]} for writing: $!";
         print $fh $$;
         close $fh;
@@ -183,6 +187,8 @@
           and -d $data_dir;
 
     $SIG{TERM} = sub { exit };
+    mkdir PIDDIR or die "Can't create directory @{[PIDDIR]}: $!"
+        if !-d PIDDIR;
     open my $fh, '>', PIDFILE or die "Can't open @{[PIDFILE]} for writing: $!";
     print $fh $$;
     close $fh;
@@ -203,6 +209,8 @@
 
 sub _stop {
     my $self = shift;
+    mkdir PIDDIR or die "Can't create directory @{[PIDDIR]}: $!"
+        if !-d PIDDIR;
     open my $fh, '<', PARENTPIDFILE or die "Can't open @{[PARENTPIDFILE]} for reading: $!";
     my $pid = <$fh>;
     kill 'TERM' => $pid;


More information about the Jifty-commit mailing list