FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

ccurpcd: fixed check for running process

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10231 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
fhemzap 2015-12-22 17:56:38 +00:00
parent 031454d11c
commit 827ae537de
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fhem/contrib/HMCCU/ccurpcd.pl
View File

@ -41,18 +41,26 @@ my $logfile;
my $shutdown = 0;
my $eventcount = 0;
sub CheckProcess ($);
sub Log ($);
#####################################
# Get PID of running RPC server or 0
#####################################
sub CheckProcess
sub CheckProcess ($)
{
my $pdump = `ps -ef | grep ccurpcd\.pl | grep -v grep`;
my ($prcname) = @_;
my $pdump = `ps -ef | grep $prcname | grep -v grep`;
my @plist = split "\n", $pdump;
foreach my $proc (@plist) {
my @procattr = split /\s+/, $proc;
return $procattr[1] if ($procattr[1] != $$);
if ($procattr[1] != $$ && $procattr[7] =~ /perl$/ && $procattr[8] eq $prcname) {
Log "Process $proc is running";
return $procattr[1];
}
}
return 0;
@ -215,9 +223,9 @@ sub CCURPC_NewDevicesCB ($$$)
Log "NewDevice: received ".scalar(@$a)." device specifications";
# for my $dev (@$a) {
# WriteQueue ("ND|".$dev->{ADDRESS}."|".$dev->{TYPE});
# }
for my $dev (@$a) {
WriteQueue ("ND|".$dev->{ADDRESS}."|".$dev->{TYPE});
}
# return RPC::XML::array->new();
return;
@ -288,9 +296,11 @@ sub CCURPC_ListDevicesCB ()
# MAIN
#####################################
my $name = $0;
# Process command line arguments
if ($#ARGV+1 != 4) {
die "Usage: ccurpc.pl CCU-Host Port QueueFile LogFile\n";
die "Usage: $name CCU-Host Port QueueFile LogFile\n";
}
my $ccuhost = $ARGV[0];
@ -298,7 +308,7 @@ my $ccuport = $ARGV[1];
my $queuefile = $ARGV[2];
$logfile = $ARGV[3];
my $pid = CheckProcess ();
my $pid = CheckProcess ($name);
if ($pid > 0) {
Log "Error: ccurpcd.pl is already running (PID=$pid)";
die "Error: ccurpcd.pl is already running (PID=$pid)\n";