X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FDaemon.pm;h=b58cde49f0716ad130507f05d3df8d51228710ea;hp=ca181345a493fc38784ad0cf29e2fd28459f237c;hb=395cc72629d31c8dcd138acf423e66d2d73d89d2;hpb=63a268637b2d51a8766412617724b9436439deb6

diff --git a/FS/FS/Daemon.pm b/FS/FS/Daemon.pm
index ca181345a..b58cde49f 100644
--- a/FS/FS/Daemon.pm
+++ b/FS/FS/Daemon.pm
@@ -1,11 +1,13 @@
 package FS::Daemon;
 
 use vars qw( @ISA @EXPORT_OK );
-use vars qw( $pid_dir $me $pid_file $sigint $sigterm $logfile );
+use vars qw( $pid_dir $me $pid_file $sigint $sigterm $NOSIG $logfile );
 use Exporter;
 use Fcntl qw(:flock);
 use POSIX qw(setsid);
 use IO::File;
+use File::Basename;
+use File::Slurp qw(slurp);
 use Date::Format;
 
 #this is a simple refactoring of the stuff from freeside-queued, just to
@@ -19,10 +21,19 @@ use Date::Format;
 
 $pid_dir = '/var/run';
 
+$NOSIG = 0;
+$PID_NEWSTYLE = 0;
+
 sub daemonize1 {
   $me = shift;
 
-  $pid_file = "$pid_dir/$me";
+  $pid_file = $pid_dir;
+  if ( $PID_NEWSTYLE ) {
+    $pid_file .= '/freeside';
+    mkdir $pid_file unless -d $pid_file;
+    chown $FS::UID::freeside_uid, -1, $pid_file;
+  }
+  $pid_file .= "/$me";
   $pid_file .= '.'.shift if scalar(@_);
   $pid_file .= '.pid';
 
@@ -33,6 +44,7 @@ sub daemonize1 {
     print "$me started with pid $pid\n"; #logging to $log_file\n";
     exit unless $pid_file;
     my $pidfh = new IO::File ">$pid_file" or exit;
+    chown $FS::UID::freeside_uid, -1, $pid_file;
     print $pidfh "$pid\n";
     exit;
   }
@@ -41,8 +53,10 @@ sub daemonize1 {
   #$SIG{CHLD} =  \&REAPER;
   $sigterm = 0;
   $sigint = 0;
-  $SIG{INT}  = sub { warn "SIGINT received; shutting down\n"; $sigint++;  };
-  $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
+  unless ( $NOSIG ) {
+    $SIG{INT}  = sub { warn "SIGINT received; shutting down\n"; $sigint++;  };
+    $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
+  }
 }
 
 sub drop_root {
@@ -78,13 +92,18 @@ sub sigterm { $sigterm; }
 sub logfile { $logfile = shift; } #_logmsg('test'); }
 
 sub myexit {
-  unlink $pid_file if -e $pid_file;
+  chomp( my $pid = slurp($pid_file) );
+  unlink $pid_file if -e $pid_file && $$ == $pid;
   exit;  
 }
 
 sub _die {
+  die @_ if $^S; # $^S = 1 during an eval(), don't break exception handling
   my $msg = shift;
-  unlink $pid_file if -e $pid_file;
+
+  chomp( my $pid = slurp($pid_file) );
+  unlink $pid_file if -e $pid_file && $$ == $pid;
+
   _logmsg($msg);
 }
 
@@ -98,3 +117,4 @@ sub _logmsg {
   close $log;
 }
 
+1;