my $pid;
my $pidfile;
my $pidfiles = "";
- my $pidsrunning = "";
+ my $slavepids = "";
+ my $serverpids = "";
if($run{$serv}) {
if($run{$serv}{'slavepidfiles'}) {
$pidfiles .= " $pidfile";
$pid = checkalivepidfile($pidfile);
if($pid > 0) {
- $pidsrunning .= " $pid";
+ $slavepids .= " $pid";
}
}
delete $run{$serv}{'slavepidfiles'};
$pidfiles .= " $pidfile";
$pid = checkalivepidfile($pidfile);
if($pid > 0) {
- $pidsrunning .= " $pid";
+ $serverpids .= " $pid";
}
delete $run{$serv}{'pidfile'};
}
if($run{$serv}{'pids'}) {
$pid = $run{$serv}{'pids'};
- $pidsrunning .= " $pid";
+ $serverpids .= " $pid";
delete $run{$serv}{'pids'};
}
if($run{$serv}) {
delete $run{$serv};
}
}
- if($pidsrunning) {
- $ret = stopprocess($pidsrunning);
+ if($slavepids) {
+ $ret = stopprocess($slavepids);
+ }
+ if($serverpids) {
+ $ret = stopprocess($serverpids);
}
if($pidfiles) {
unlinkpidfiles($pidfiles);
my $pid;
my $pidfile;
my $pidfiles = "";
- my $pidsrunning = "";
+ my $slavepids = "";
+ my $serverpids = "";
for my $serv (keys %run) {
if($run{$serv}) {
$pidfiles .= " $pidfile";
$pid = checkalivepidfile($pidfile);
if($pid > 0) {
- $pidsrunning .= " $pid";
+ $slavepids .= " $pid";
}
}
delete $run{$serv}{'slavepidfiles'};
$pidfiles .= " $pidfile";
$pid = checkalivepidfile($pidfile);
if($pid > 0) {
- $pidsrunning .= " $pid";
+ $serverpids .= " $pid";
}
delete $run{$serv}{'pidfile'};
}
if($run{$serv}{'pids'}) {
$pid = $run{$serv}{'pids'};
- $pidsrunning .= " $pid";
+ $serverpids .= " $pid";
delete $run{$serv}{'pids'};
}
if($run{$serv}) {
}
}
}
- if($pidsrunning) {
- $ret = stopprocess($pidsrunning);
+ if($slavepids) {
+ $ret = stopprocess($slavepids);
+ }
+ if($serverpids) {
+ $ret = stopprocess($serverpids);
}
if($pidfiles) {
unlinkpidfiles($pidfiles);