maff
/
scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added proper pidfile handling, executing pscrot while it's already running will now cause it to SIGHUP the existing process rather than attempt to start again

This commit is contained in:
Maff 2014-09-26 21:32:15 +01:00
parent 915a8e13e2
commit a9491e4b1d
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pscrot
View File

@ -7,7 +7,6 @@ use strict;
use warnings; use warnings;
# github:MaffC/maffpl.git provides the Maff:: namespace # github:MaffC/maffpl.git provides the Maff:: namespace
use Maff::Common::IO qw/:all/;
use Maff::Common::OSX qw/:all/; use Maff::Common::OSX qw/:all/;
use Maff::Common::Net qw/scp_upload/; use Maff::Common::Net qw/scp_upload/;
@ -15,18 +14,16 @@ use Date::Format qw/time2str/;
use POE; use POE;
use POE::Component::DirWatch; use POE::Component::DirWatch;
use POSIX; use POSIX;
use Unix::PID;
my $ME = "pscrot"; my $ME = "pscrot";
my $VERSION = "0.5.1"; my $VERSION = "0.6.1";
my $HOSTNAME = `hostname`; chomp $HOSTNAME; my $HOSTNAME = `hostname`; chomp $HOSTNAME;
my $rcfile = $ENV{"HOME"}."/.pscrotrc";
our %Conf;
# Load config file at ~/.pscrotrc. # Load config file at ~/.pscrotrc.
unless(my $ret = do $rcfile) { my $rcfile = $ENV{"HOME"}."/.pscrotrc";
logger(9, "Couldn't parse config file $rcfile!") if $@; our %Conf;
logger(9, "Couldn't load config file $rcfile!") unless defined $ret and $ret; load_config($rcfile);
}
my $LOGFILE = "$Conf{home}/.$ME.log"; my $LOGFILE = "$Conf{home}/.$ME.log";
my $ERRFILE = "$Conf{home}/.$ME.err"; my $ERRFILE = "$Conf{home}/.$ME.err";
@ -37,6 +34,13 @@ my $running = 0;
my $sighup = 0; my $sighup = 0;
# Functions # Functions
sub load_config {
my $cfgfile = shift;
unless(my $ret = do $cfgfile) {
logger(9, "Couldn't parse config file $cfgfile!") if $@;
logger(9, "Couldn't load config file $cfgfile!") unless defined $ret and $ret;
}
}
sub mac_notify { sub mac_notify {
return unless $Conf{features}{notify}; return unless $Conf{features}{notify};
macintalk_say text=>$_[($_[0] eq $ME)? 1 : 0] if $Conf{features}{speak}; macintalk_say text=>$_[($_[0] eq $ME)? 1 : 0] if $Conf{features}{speak};
@ -110,12 +114,13 @@ sub found_file {
# Main # Main
POE::Kernel->run(); POE::Kernel->run();
my $pid = Unix::PID->new()->is_pidfile_running($PIDFILE) || 0;
kill 'HUP', $pid and logger(8, "$ME already running, restarting.") if $pid != $$ and $pid > 0;
Unix::PID->new()->pid_file($PIDFILE) or logger(9, "Failed to write PID to $PIDFILE");
open(STDOUT, ">>$LOGFILE"); open(STDOUT, ">>$LOGFILE");
open(STDERR, ">>$ERRFILE"); open(STDERR, ">>$ERRFILE");
select((select(STDOUT), $|=1)[0]); select((select(STDOUT), $|=1)[0]);
#TODO check $PIDFILE for previously started process, SIGHUP it to restart and then quit
logger(1,"Starting $ME.."); logger(1,"Starting $ME..");
write_simple $PIDFILE, $$ or logger(9, "Failed to write PID to file $PIDFILE");
$running = 1; $running = 1;